From 4f26d5927d998f63d078ac985363e68a8f137677 Mon Sep 17 00:00:00 2001 From: Jeromy Date: Wed, 18 Nov 2015 11:47:51 -0800 Subject: [PATCH] migrate to gx namespace --- addr/addrsrcs.go | 2 +- addr/addrsrcs_test.go | 2 +- addr_manager.go | 2 +- addr_manager_test.go | 4 ++-- peer.go | 12 ++++++------ peer_test.go | 4 ++-- peerstore.go | 34 +++++++++++++++++++++++++--------- queue/distance.go | 2 +- queue/queue_test.go | 4 ++-- queue/sync.go | 4 ++-- 10 files changed, 43 insertions(+), 27 deletions(-) diff --git a/addr/addrsrcs.go b/addr/addrsrcs.go index babfea5..ae9073a 100644 --- a/addr/addrsrcs.go +++ b/addr/addrsrcs.go @@ -2,7 +2,7 @@ package addr import ( - ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr" + ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr" ) // AddrSource is a source of addresses. It allows clients to retrieve diff --git a/addr/addrsrcs_test.go b/addr/addrsrcs_test.go index 81b3a05..173fbca 100644 --- a/addr/addrsrcs_test.go +++ b/addr/addrsrcs_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr" + ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr" ) func newAddrOrFatal(t *testing.T, s string) ma.Multiaddr { diff --git a/addr_manager.go b/addr_manager.go index d3781ce..1129b06 100644 --- a/addr_manager.go +++ b/addr_manager.go @@ -4,7 +4,7 @@ import ( "sync" "time" - ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr" + ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr" ) const ( diff --git a/addr_manager_test.go b/addr_manager_test.go index 3079979..59bcf19 100644 --- a/addr_manager_test.go +++ b/addr_manager_test.go @@ -4,13 +4,13 @@ import ( "testing" "time" - ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr" + ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr" ) func IDS(t *testing.T, ids string) ID { id, err := IDB58Decode(ids) if err != nil { - t.Fatal(err) + t.Fatalf("id %q is bad: %s", ids, err) } return id } diff --git a/peer.go b/peer.go index 4b907d3..0e7c009 100644 --- a/peer.go +++ b/peer.go @@ -7,13 +7,13 @@ import ( "fmt" "strings" - b58 "QmNsoHoCVhgXcv1Yg45jtkMgimxorTAN36fV9AQMFXHHAQ/go-base58" - ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr" - mh "QmdsKjp5fcCT8PZ8JBMcdFsCbbmKwSLCU5xXbsnwb5DMxy/go-multihash" + b58 "gx/QmNsoHoCVhgXcv1Yg45jtkMgimxorTAN36fV9AQMFXHHAQ/go-base58" + ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr" + mh "gx/Qma7dqy7ZVH4tkNJdC9TRrA82Uz5fQfbbwuvmNVVc17r7a/go-multihash" - logging "QmWRypnfEwrgH4k93KEHN5hng7VjKYkWmzDYRuTZeh2Mgh/go-log" - u "Qmah3kfjwhVxBM4qGnrqJTqGzrF8svwByyhExPipA2U6LE/go-ipfs-util" ic "github.com/ipfs/go-libp2p/p2p/crypto" + u "gx/QmQA79FfVsUnGkH3TgKDqcDkupfjqLSJ6EYwDuDDZK8nhD/go-ipfs-util" + logging "gx/QmfZZB1aVXWA4kaR5R4e9NifERT366TTCSagkfhmAbYLsu/go-log" ) var log = logging.Logger("peer") @@ -43,7 +43,7 @@ func (id ID) String() string { //All sha256 nodes start with Qm //We can skip the Qm to make the peer.ID more useful - if strings.HasPrefix(pid, "Qm") { + if strings.HasPrefix(pid, "gx/Qm") { pid = pid[2:] } diff --git a/peer_test.go b/peer_test.go index 7472db1..3ad9c23 100644 --- a/peer_test.go +++ b/peer_test.go @@ -9,9 +9,9 @@ import ( ic "github.com/ipfs/go-libp2p/p2p/crypto" . "github.com/ipfs/go-libp2p/p2p/peer" tu "github.com/ipfs/go-libp2p/testutil" - u "Qmah3kfjwhVxBM4qGnrqJTqGzrF8svwByyhExPipA2U6LE/go-ipfs-util" + u "gx/QmQA79FfVsUnGkH3TgKDqcDkupfjqLSJ6EYwDuDDZK8nhD/go-ipfs-util" - b58 "QmNsoHoCVhgXcv1Yg45jtkMgimxorTAN36fV9AQMFXHHAQ/go-base58" + b58 "gx/QmNsoHoCVhgXcv1Yg45jtkMgimxorTAN36fV9AQMFXHHAQ/go-base58" ) var gen1 keyset // generated diff --git a/peerstore.go b/peerstore.go index dea66f3..ef86182 100644 --- a/peerstore.go +++ b/peerstore.go @@ -7,9 +7,9 @@ import ( ic "github.com/ipfs/go-libp2p/p2p/crypto" - ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr" - ds "github.com/jbenet/go-datastore" - dssync "github.com/jbenet/go-datastore/sync" + //ds "github.com/jbenet/go-datastore" + //dssync "github.com/jbenet/go-datastore/sync" + ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr" ) const ( @@ -153,7 +153,10 @@ type peerstore struct { AddrManager // store other data, like versions - ds ds.ThreadSafeDatastore + //ds ds.ThreadSafeDatastore + // TODO: use a datastore for this + ds map[string]interface{} + dslock sync.Mutex } // NewPeerstore creates a threadsafe collection of peers. @@ -162,18 +165,31 @@ func NewPeerstore() Peerstore { keybook: *newKeybook(), metrics: *(NewMetrics()).(*metrics), AddrManager: AddrManager{}, - ds: dssync.MutexWrap(ds.NewMapDatastore()), + //ds: dssync.MutexWrap(ds.NewMapDatastore()), + ds: make(map[string]interface{}), } } func (ps *peerstore) Put(p ID, key string, val interface{}) error { - dsk := ds.NewKey(string(p) + "/" + key) - return ps.ds.Put(dsk, val) + //dsk := ds.NewKey(string(p) + "/" + key) + //return ps.ds.Put(dsk, val) + ps.dslock.Lock() + defer ps.dslock.Unlock() + ps.ds[string(p)+"/"+key] = val + return nil } func (ps *peerstore) Get(p ID, key string) (interface{}, error) { - dsk := ds.NewKey(string(p) + "/" + key) - return ps.ds.Get(dsk) + //dsk := ds.NewKey(string(p) + "/" + key) + //return ps.ds.Get(dsk) + + ps.dslock.Lock() + defer ps.dslock.Unlock() + i, ok := ps.ds[string(p)+"/"+key] + if !ok { + return nil, errors.New("item not found") + } + return i, nil } func (ps *peerstore) Peers() []ID { diff --git a/queue/distance.go b/queue/distance.go index 9600f87..beb7605 100644 --- a/queue/distance.go +++ b/queue/distance.go @@ -5,8 +5,8 @@ import ( "math/big" "sync" - ks "Qma4vHVBYKDiKS5VpvtLNJHHDbL7S6VRsvxxmBnBFfKP3k/go-keyspace" peer "github.com/ipfs/go-libp2p/p2p/peer" + ks "gx/QmThbzo9oBE7FAVmgjp3xYv5Yra81uB7KXbrTei47gWT6o/go-keyspace" ) // peerMetric tracks a peer and its distance to something else. diff --git a/queue/queue_test.go b/queue/queue_test.go index d42ebca..ca449fe 100644 --- a/queue/queue_test.go +++ b/queue/queue_test.go @@ -7,9 +7,9 @@ import ( "time" peer "github.com/ipfs/go-libp2p/p2p/peer" - u "Qmah3kfjwhVxBM4qGnrqJTqGzrF8svwByyhExPipA2U6LE/go-ipfs-util" + u "gx/QmQA79FfVsUnGkH3TgKDqcDkupfjqLSJ6EYwDuDDZK8nhD/go-ipfs-util" - context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" + context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" ) func TestQueue(t *testing.T) { diff --git a/queue/sync.go b/queue/sync.go index 6d834e8..ccece46 100644 --- a/queue/sync.go +++ b/queue/sync.go @@ -1,9 +1,9 @@ package queue import ( - logging "QmWRypnfEwrgH4k93KEHN5hng7VjKYkWmzDYRuTZeh2Mgh/go-log" - context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" peer "github.com/ipfs/go-libp2p/p2p/peer" + context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" + logging "gx/QmfZZB1aVXWA4kaR5R4e9NifERT366TTCSagkfhmAbYLsu/go-log" ) var log = logging.Logger("peerqueue")