use no padding encoding
License: MIT Signed-off-by: Jeromy <why@ipfs.io>
Jeromy committed
Jun 27, 2016 at 14:43 UTC
d489f82b590e00257296bce45daf1671770d892e
2 files changed
+11
-5
package.json
+6
@@ -171,6 +171,12 @@
171
"hash": "QmQdnfvZQuhdT93LNc5bos52wAmdr3G2p6G8teLJMEN32P",
172
"name": "go-libp2p-peerstore",
173
"version": "1.1.2"
174
+ },
175
+ {
176
+ "author": "whyrusleeping",
177
+ "hash": "Qmb1DA2A9LS2wR4FFweB4uEDomFsdmnw1VLawLE1yQzudj",
178
+ "name": "base32",
179
+ "version": "0.0.0"
180
}
181
],
182
"gxVersion": "0.4.0",
routing/dht/providers/providers.go
+5
-5
@@ -1,7 +1,6 @@
1
package providers
2
3
import (
4
- "encoding/base32"
4
"encoding/binary"
5
"fmt"
6
"strings"
@@ -14,6 +13,7 @@ import (
13
lru "gx/ipfs/QmVYxfoJQiZijTgPNHCHgHELvQpbsJNTg6Crmc3dQkj3yy/golang-lru"
14
ds "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore"
15
dsq "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore/query"
16
+ base32 "gx/ipfs/Qmb1DA2A9LS2wR4FFweB4uEDomFsdmnw1VLawLE1yQzudj/base32"
17
18
key "github.com/ipfs/go-ipfs/blocks/key"
19
@@ -81,7 +81,7 @@ func NewProviderManager(ctx context.Context, local peer.ID, dstore ds.Datastore)
81
const providersKeyPrefix = "/providers/"
82
83
func mkProvKey(k key.Key) ds.Key {
84
- return ds.NewKey(providersKeyPrefix + base32.StdEncoding.EncodeToString([]byte(k)))
84
+ return ds.NewKey(providersKeyPrefix + base32.RawStdEncoding.EncodeToString([]byte(k)))
85
}
86
87
func (pm *ProviderManager) Process() goprocess.Process {
@@ -132,7 +132,7 @@ func loadProvSet(dstore ds.Datastore, k key.Key) (*providerSet, error) {
132
continue
133
}
134
135
- decstr, err := base32.StdEncoding.DecodeString(parts[len(parts)-1])
135
+ decstr, err := base32.RawStdEncoding.DecodeString(parts[len(parts)-1])
136
if err != nil {
137
log.Error("base32 decoding error: ", err)
138
continue
@@ -177,7 +177,7 @@ func (pm *ProviderManager) addProv(k key.Key, p peer.ID) error {
177
}
178
179
func writeProviderEntry(dstore ds.Datastore, k key.Key, p peer.ID, t time.Time) error {
180
- dsk := mkProvKey(k).ChildString(base32.StdEncoding.EncodeToString([]byte(p)))
180
+ dsk := mkProvKey(k).ChildString(base32.RawStdEncoding.EncodeToString([]byte(p)))
181
182
buf := make([]byte, 16)
183
n := binary.PutVarint(buf, t.UnixNano())
@@ -230,7 +230,7 @@ func (pm *ProviderManager) getAllProvKeys() ([]key.Key, error) {
230
log.Warning("incorrectly formatted provider entry in datastore")
231
continue
232
}
233
- decoded, err := base32.StdEncoding.DecodeString(parts[2])
233
+ decoded, err := base32.RawStdEncoding.DecodeString(parts[2])
234
if err != nil {
235
log.Warning("error decoding base32 provider key")
236
continue