@cryptotaxi247 / kubo / commits / a1419a496

fix peerstore constructor calls

License: MIT Signed-off-by: Steven Allen <steven@stebalien.com>

Steven Allen committed Sep 7, 2018 at 23:46 UTC a1419a4961f91a763f01a59e779b54de2ac76ce1
4 files changed +8 -5
cmd/seccat/seccat.go
+2 -1
@@ -24,6 +24,7 @@ import (
24 logging "gx/ipfs/QmRREK2CAZ5Re2Bd9zZFG6FeYDppUWt5cMgsoUEp3ktgSr/go-log"
25 secio "gx/ipfs/QmReYSQGHjf28pKf93FwyD72mLXoZo94MB2Cq6VBSUHvFB/go-libp2p-secio"
26 pstore "gx/ipfs/Qmda4cPRvSRyox3SqgJN6DfSZGU5TtHufPTp9uXjFj71X6/go-libp2p-peerstore"
27 + pstoremem "gx/ipfs/Qmda4cPRvSRyox3SqgJN6DfSZGU5TtHufPTp9uXjFj71X6/go-libp2p-peerstore/pstoremem"
28 )
29
30 var verbose = false
@@ -127,7 +128,7 @@ func setupPeer(a args) (peer.ID, pstore.Peerstore, error) {
128 return "", nil, err
129 }
130
130 - ps := pstore.NewPeerstore()
131 + ps := pstoremem.NewPeerstore()
132 ps.AddPrivKey(p, sk)
133 ps.AddPubKey(p, pk)
134
core/builder.go
+2 -1
@@ -31,6 +31,7 @@ import (
31 ipns "gx/ipfs/QmbUUxB9ErnEQdwTzy6HTxucnBvAH4am6vsfbD8CiqKhi9/go-ipns"
32 record "gx/ipfs/QmdHb9aBELnQKTVhvvA3hsQbRgUAwsWUzBP2vZ6Y5FBYvE/go-libp2p-record"
33 pstore "gx/ipfs/Qmda4cPRvSRyox3SqgJN6DfSZGU5TtHufPTp9uXjFj71X6/go-libp2p-peerstore"
34 + pstoremem "gx/ipfs/Qmda4cPRvSRyox3SqgJN6DfSZGU5TtHufPTp9uXjFj71X6/go-libp2p-peerstore/pstoremem"
35 p2phost "gx/ipfs/QmeMYW7Nj8jnnEfs9qhm7SxKkoDPUWXu3MsxX6BFwz34tf/go-libp2p-host"
36 bstore "gx/ipfs/Qmeg56ecxRnVv7VWViMrDeEMoBHaNFMs4vQnyQrJ79Zz7i/go-ipfs-blockstore"
37 metrics "gx/ipfs/QmekzFM3hPZjTjUFGTABdQkEnQ3PTiMstY198PwSFr5w1Q/go-metrics-interface"
@@ -142,7 +143,7 @@ func NewNode(ctx context.Context, cfg *BuildCfg) (*IpfsNode, error) {
143 mode: offlineMode,
144 Repo: cfg.Repo,
145 ctx: ctx,
145 - Peerstore: pstore.NewPeerstore(),
146 + Peerstore: pstoremem.NewPeerstore(),
147 }
148
149 n.RecordValidator = record.NamespacedValidator{
namesys/ipns_resolver_validation_test.go
+2 -1
@@ -21,13 +21,14 @@ import (
21 ipns "gx/ipfs/QmbUUxB9ErnEQdwTzy6HTxucnBvAH4am6vsfbD8CiqKhi9/go-ipns"
22 record "gx/ipfs/QmdHb9aBELnQKTVhvvA3hsQbRgUAwsWUzBP2vZ6Y5FBYvE/go-libp2p-record"
23 pstore "gx/ipfs/Qmda4cPRvSRyox3SqgJN6DfSZGU5TtHufPTp9uXjFj71X6/go-libp2p-peerstore"
24 + pstoremem "gx/ipfs/Qmda4cPRvSRyox3SqgJN6DfSZGU5TtHufPTp9uXjFj71X6/go-libp2p-peerstore/pstoremem"
25 )
26
27 func TestResolverValidation(t *testing.T) {
28 ctx := context.Background()
29 rid := testutil.RandIdentityOrFatal(t)
30 dstore := dssync.MutexWrap(ds.NewMapDatastore())
30 - peerstore := pstore.NewPeerstore()
31 + peerstore := pstoremem.NewPeerstore()
32
33 vstore := newMockValueStore(rid, dstore, peerstore)
34 resolver := NewIpnsResolver(vstore)
namesys/namesys_test.go
+2 -2
@@ -16,7 +16,7 @@ import (
16 ds "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore"
17 dssync "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore/sync"
18 ipns "gx/ipfs/QmbUUxB9ErnEQdwTzy6HTxucnBvAH4am6vsfbD8CiqKhi9/go-ipns"
19 - pstore "gx/ipfs/Qmda4cPRvSRyox3SqgJN6DfSZGU5TtHufPTp9uXjFj71X6/go-libp2p-peerstore"
19 + pstoremem "gx/ipfs/Qmda4cPRvSRyox3SqgJN6DfSZGU5TtHufPTp9uXjFj71X6/go-libp2p-peerstore/pstoremem"
20 )
21
22 type mockResolver struct {
@@ -86,7 +86,7 @@ func TestPublishWithCache0(t *testing.T) {
86 if err != nil {
87 t.Fatal(err)
88 }
89 - ps := pstore.NewPeerstore()
89 + ps := pstoremem.NewPeerstore()
90 pid, err := peer.IDFromPrivateKey(priv)
91 if err != nil {
92 t.Fatal(err)