From a945d4dad298aa951abb610195bd401d3a0e1286 Mon Sep 17 00:00:00 2001 From: llSourcell Date: Mon, 15 Sep 2014 10:59:05 -0700 Subject: [PATCH 1/6] add test for DHT package #59 --- routing/dht/providers_test.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/routing/dht/providers_test.go b/routing/dht/providers_test.go index 0cdfa4fcc78..712e72301d4 100644 --- a/routing/dht/providers_test.go +++ b/routing/dht/providers_test.go @@ -13,8 +13,13 @@ func TestProviderManager(t *testing.T) { a := u.Key("test") p.AddProvider(a, &peer.Peer{}) resp := p.GetProviders(a) + resp2 := p.GetLocal() if len(resp) != 1 { t.Fatal("Could not retrieve provider.") } + if len(resp2) != 1 { + t.Fatal("Could not retrieve provider.") + } + p.Halt() } From 56f57b7bcc374b580730b84ffba824b62fc55b9f Mon Sep 17 00:00:00 2001 From: llSourcell Date: Mon, 15 Sep 2014 11:56:22 -0700 Subject: [PATCH 2/6] clarifying variables --- routing/dht/providers_test.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/routing/dht/providers_test.go b/routing/dht/providers_test.go index 712e72301d4..8620bc88073 100644 --- a/routing/dht/providers_test.go +++ b/routing/dht/providers_test.go @@ -12,13 +12,13 @@ func TestProviderManager(t *testing.T) { p := NewProviderManager(mid) a := u.Key("test") p.AddProvider(a, &peer.Peer{}) - resp := p.GetProviders(a) - resp2 := p.GetLocal() - if len(resp) != 1 { - t.Fatal("Could not retrieve provider.") + remotePeers := p.GetProviders(a) + localPeers := p.GetLocal() + if len(remotePeers) != 1 { + t.Fatal("Could not retrieve remote provider.") } - if len(resp2) != 1 { - t.Fatal("Could not retrieve provider.") + if len(localPeers) != 1 { + t.Fatal("Could not retrieve local provider.") } p.Halt() From cebcf102352e5940fa0d350e52ace95bc5ca2b37 Mon Sep 17 00:00:00 2001 From: llSourcell Date: Mon, 15 Sep 2014 13:30:44 -0700 Subject: [PATCH 3/6] tests for Daemon Listener #59 --- daemon/daemon_test.go | 50 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 daemon/daemon_test.go diff --git a/daemon/daemon_test.go b/daemon/daemon_test.go new file mode 100644 index 00000000000..1d9aca70f3e --- /dev/null +++ b/daemon/daemon_test.go @@ -0,0 +1,50 @@ +package daemon + +import ( + "testing" + + config "github.com/jbenet/go-ipfs/config" + core "github.com/jbenet/go-ipfs/core" +) + +func TestDaemonListener(t *testing.T) { + + id := &config.Identity{ + PeerID: "QmNgdzLieYi8tgfo2WfTUzNVH5hQK9oAYGVf6dxN12NrHt", + Address: "/ip4/127.0.0.1/tcp/8000", + PrivKey: "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", + } + + nodeConfigs := []*config.Config{ + &config.Config{ + Identity: id, + Datastore: config.Datastore{ + Type: "memory", + }, + }, + + &config.Config{ + Identity: id, + Datastore: config.Datastore{ + Type: "leveldb", + Path: ".testdb", + }, + }, + } + + for _, c := range nodeConfigs { + + node, _ := core.NewIpfsNode(c, false) + dl, initErr := NewDaemonListener(node, "localhost:1327") + if initErr != nil { + t.Fatal(initErr) + } + + closeErr := dl.Close() + if closeErr != nil { + t.Fatal(closeErr) + } + + } + +} From 9b93f46972cf5d5abfa9c9712f1aace0e7eba762 Mon Sep 17 00:00:00 2001 From: llSourcell Date: Mon, 15 Sep 2014 17:06:50 -0700 Subject: [PATCH 4/6] generating privKey, added shutdown function for ipfsnode --- core/core.go | 24 +++++++++++++++++++++--- core/core_test.go | 2 ++ daemon/daemon_test.go | 17 +++++++++++++++-- 3 files changed, 38 insertions(+), 5 deletions(-) diff --git a/core/core.go b/core/core.go index 0a9db055a9e..5bc05815ed4 100644 --- a/core/core.go +++ b/core/core.go @@ -56,6 +56,7 @@ type IpfsNode struct { // the name system, resolves paths to hashes // Namesys *namesys.Namesys + } // NewIpfsNode constructs a new IpfsNode based on the given config. @@ -77,8 +78,8 @@ func NewIpfsNode(cfg *config.Config, online bool) (*IpfsNode, error) { var ( net *swarm.Swarm // TODO: refactor so we can use IpfsRouting interface instead of being DHT-specific - route* dht.IpfsDHT - swap *bitswap.BitSwap + route *dht.IpfsDHT + swap *bitswap.BitSwap ) if online { @@ -134,7 +135,7 @@ func initIdentity(cfg *config.Config) (*peer.Peer, error) { return nil, err } - addresses = []*ma.Multiaddr{ maddr } + addresses = []*ma.Multiaddr{maddr} } skb, err := base64.StdEncoding.DecodeString(cfg.Identity.PrivKey) @@ -174,3 +175,20 @@ func (n *IpfsNode) PinDagNode(nd *merkledag.Node) error { u.POut("Pinning node. Currently No-Op\n") return nil } + +func (n *IpfsNode) Close() (*IpfsNode, error) { + //n.Swarm.Close() + + return &IpfsNode{ + Config: nil, + PeerMap: nil, + Datastore: nil, + Blocks: nil, + DAG: nil, + Resolver: nil, + BitSwap: nil, + Identity: nil, + Routing: nil, + }, nil + +} diff --git a/core/core_test.go b/core/core_test.go index c6695eb6b63..465f943ab35 100644 --- a/core/core_test.go +++ b/core/core_test.go @@ -43,6 +43,7 @@ func TestInitialization(t *testing.T) { if n == nil || err != nil { t.Error("Should have constructed.", i, err) } + n.Close() } for i, c := range bad { @@ -50,5 +51,6 @@ func TestInitialization(t *testing.T) { if n != nil || err == nil { t.Error("Should have failed to construct.", i) } + n.Close() } } diff --git a/daemon/daemon_test.go b/daemon/daemon_test.go index 1d9aca70f3e..0ac14c0178b 100644 --- a/daemon/daemon_test.go +++ b/daemon/daemon_test.go @@ -1,18 +1,31 @@ package daemon import ( + "encoding/base64" "testing" config "github.com/jbenet/go-ipfs/config" core "github.com/jbenet/go-ipfs/core" + ci "github.com/jbenet/go-ipfs/crypto" ) func TestDaemonListener(t *testing.T) { + priv, _, err := ci.GenerateKeyPair(ci.RSA, 512) + if err != nil { + t.Fatal(err) + } + prbytes, err := priv.Bytes() + if err != nil { + t.Fatal(err) + } + + privKey := base64.StdEncoding.EncodeToString(prbytes) + id := &config.Identity{ PeerID: "QmNgdzLieYi8tgfo2WfTUzNVH5hQK9oAYGVf6dxN12NrHt", Address: "/ip4/127.0.0.1/tcp/8000", - PrivKey: "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", + PrivKey: privKey, } nodeConfigs := []*config.Config{ @@ -39,11 +52,11 @@ func TestDaemonListener(t *testing.T) { if initErr != nil { t.Fatal(initErr) } - closeErr := dl.Close() if closeErr != nil { t.Fatal(closeErr) } + node.Close() } From 36dbe067b65bc96c8382aa6582359f0073142c76 Mon Sep 17 00:00:00 2001 From: llSourcell Date: Mon, 15 Sep 2014 17:59:39 -0700 Subject: [PATCH 5/6] using IDfromPubKey --- daemon/daemon_test.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/daemon/daemon_test.go b/daemon/daemon_test.go index 0ac14c0178b..1645365a8f0 100644 --- a/daemon/daemon_test.go +++ b/daemon/daemon_test.go @@ -7,11 +7,12 @@ import ( config "github.com/jbenet/go-ipfs/config" core "github.com/jbenet/go-ipfs/core" ci "github.com/jbenet/go-ipfs/crypto" + identify "github.com/jbenet/go-ipfs/identify" ) func TestDaemonListener(t *testing.T) { - priv, _, err := ci.GenerateKeyPair(ci.RSA, 512) + priv, pub, err := ci.GenerateKeyPair(ci.RSA, 512) if err != nil { t.Fatal(err) } @@ -20,10 +21,12 @@ func TestDaemonListener(t *testing.T) { t.Fatal(err) } + ident, _ := identify.IDFromPubKey(pub) privKey := base64.StdEncoding.EncodeToString(prbytes) + pID := ident.Pretty() id := &config.Identity{ - PeerID: "QmNgdzLieYi8tgfo2WfTUzNVH5hQK9oAYGVf6dxN12NrHt", + PeerID: pID, Address: "/ip4/127.0.0.1/tcp/8000", PrivKey: privKey, } From f8ee61a53ee67fdaf3d178253fc7c2814c30b94b Mon Sep 17 00:00:00 2001 From: llSourcell Date: Mon, 15 Sep 2014 18:03:04 -0700 Subject: [PATCH 6/6] temporarily removing ipfsnode close function, saving for future core focused pr --- core/core.go | 17 ----------------- core/core_test.go | 2 -- daemon/daemon_test.go | 1 - 3 files changed, 20 deletions(-) diff --git a/core/core.go b/core/core.go index 5bc05815ed4..60cf1fc5ff0 100644 --- a/core/core.go +++ b/core/core.go @@ -175,20 +175,3 @@ func (n *IpfsNode) PinDagNode(nd *merkledag.Node) error { u.POut("Pinning node. Currently No-Op\n") return nil } - -func (n *IpfsNode) Close() (*IpfsNode, error) { - //n.Swarm.Close() - - return &IpfsNode{ - Config: nil, - PeerMap: nil, - Datastore: nil, - Blocks: nil, - DAG: nil, - Resolver: nil, - BitSwap: nil, - Identity: nil, - Routing: nil, - }, nil - -} diff --git a/core/core_test.go b/core/core_test.go index 465f943ab35..c6695eb6b63 100644 --- a/core/core_test.go +++ b/core/core_test.go @@ -43,7 +43,6 @@ func TestInitialization(t *testing.T) { if n == nil || err != nil { t.Error("Should have constructed.", i, err) } - n.Close() } for i, c := range bad { @@ -51,6 +50,5 @@ func TestInitialization(t *testing.T) { if n != nil || err == nil { t.Error("Should have failed to construct.", i) } - n.Close() } } diff --git a/daemon/daemon_test.go b/daemon/daemon_test.go index 1645365a8f0..e901a7ef396 100644 --- a/daemon/daemon_test.go +++ b/daemon/daemon_test.go @@ -59,7 +59,6 @@ func TestDaemonListener(t *testing.T) { if closeErr != nil { t.Fatal(closeErr) } - node.Close() }