From b76b65e446e5f49a2671e849d87b21a16ab222ff Mon Sep 17 00:00:00 2001 From: Kishan Sagathiya Date: Wed, 12 Sep 2018 19:26:10 +0530 Subject: [PATCH] Issue #446 Adding peername to PinInfo Removed unnecessary peername assignment Modified tests according to the changes made to add peername to PinInfo License: MIT Signed-off-by: Kishan Mohanbhai Sagathiya --- cluster_test.go | 2 +- ipfscluster_test.go | 8 ++++---- pintracker/maptracker/maptracker_test.go | 4 ++-- pintracker/optracker/operationtracker_test.go | 3 +-- pintracker/pintracker_test.go | 8 ++++---- pintracker/stateless/stateless_test.go | 4 ++-- rpc_api.go | 1 - test/cids.go | 7 +++++++ 8 files changed, 21 insertions(+), 16 deletions(-) diff --git a/cluster_test.go b/cluster_test.go index 8d9905aa..dde103da 100644 --- a/cluster_test.go +++ b/cluster_test.go @@ -129,7 +129,7 @@ func testingCluster(t *testing.T) (*Cluster, *mockAPI, *mockConnector, state.Sta api := &mockAPI{} ipfs := &mockConnector{} st := mapstate.NewMapState() - tracker := makePinTracker(t, clusterCfg.ID, maptrackerCfg, statelesstrackerCfg) + tracker := makePinTracker(t, clusterCfg.ID, maptrackerCfg, statelesstrackerCfg, clusterCfg.Peername) raftcon, _ := raft.NewConsensus(host, consensusCfg, st, false) diff --git a/ipfscluster_test.go b/ipfscluster_test.go index c5d9adfb..9c1fcb7b 100644 --- a/ipfscluster_test.go +++ b/ipfscluster_test.go @@ -163,7 +163,7 @@ func createComponents(t *testing.T, i int, clusterSecret []byte, staging bool) ( ipfs, err := ipfshttp.NewConnector(ipfshttpCfg) checkErr(t, err) state := mapstate.NewMapState() - tracker := makePinTracker(t, clusterCfg.ID, maptrackerCfg, statelesstrackerCfg) + tracker := makePinTracker(t, clusterCfg.ID, maptrackerCfg, statelesstrackerCfg, clusterCfg.Peername) mon := makeMonitor(t, host, bmonCfg, psmonCfg) @@ -191,13 +191,13 @@ func makeMonitor(t *testing.T, h host.Host, bmonCfg *basic.Config, psmonCfg *pub return mon } -func makePinTracker(t *testing.T, pid peer.ID, mptCfg *maptracker.Config, sptCfg *stateless.Config) PinTracker { +func makePinTracker(t *testing.T, pid peer.ID, mptCfg *maptracker.Config, sptCfg *stateless.Config, peerName string) PinTracker { var ptrkr PinTracker switch ptracker { case "map": - ptrkr = maptracker.NewMapPinTracker(mptCfg, pid) + ptrkr = maptracker.NewMapPinTracker(mptCfg, pid, peerName) case "stateless": - ptrkr = stateless.New(sptCfg, pid) + ptrkr = stateless.New(sptCfg, pid, peerName) default: panic("bad pintracker") } diff --git a/pintracker/maptracker/maptracker_test.go b/pintracker/maptracker/maptracker_test.go index 0bf81aed..23ee4f46 100644 --- a/pintracker/maptracker/maptracker_test.go +++ b/pintracker/maptracker/maptracker_test.go @@ -71,7 +71,7 @@ func testSlowMapPinTracker(t *testing.T) *MapPinTracker { cfg := &Config{} cfg.Default() cfg.ConcurrentPins = 1 - mpt := NewMapPinTracker(cfg, test.TestPeerID1) + mpt := NewMapPinTracker(cfg, test.TestPeerID1, test.TestPeerName1) mpt.SetClient(mockRPCClient(t)) return mpt } @@ -80,7 +80,7 @@ func testMapPinTracker(t *testing.T) *MapPinTracker { cfg := &Config{} cfg.Default() cfg.ConcurrentPins = 1 - mpt := NewMapPinTracker(cfg, test.TestPeerID1) + mpt := NewMapPinTracker(cfg, test.TestPeerID1, test.TestPeerName1) mpt.SetClient(test.NewMockRPCClient(t)) return mpt } diff --git a/pintracker/optracker/operationtracker_test.go b/pintracker/optracker/operationtracker_test.go index 990d3331..06301da4 100644 --- a/pintracker/optracker/operationtracker_test.go +++ b/pintracker/optracker/operationtracker_test.go @@ -11,8 +11,7 @@ import ( func testOperationTracker(t *testing.T) *OperationTracker { ctx := context.Background() - pid := test.TestPeerID1 - return NewOperationTracker(ctx, pid) + return NewOperationTracker(ctx, test.TestPeerID1, test.TestPeerName1) } func TestOperationTracker_TrackNewOperation(t *testing.T) { diff --git a/pintracker/pintracker_test.go b/pintracker/pintracker_test.go index 367e5e55..6b903e85 100644 --- a/pintracker/pintracker_test.go +++ b/pintracker/pintracker_test.go @@ -202,7 +202,7 @@ var sortPinInfoByCid = func(p []api.PinInfo) { func testSlowMapPinTracker(t testing.TB) *maptracker.MapPinTracker { cfg := &maptracker.Config{} cfg.Default() - mpt := maptracker.NewMapPinTracker(cfg, test.TestPeerID1) + mpt := maptracker.NewMapPinTracker(cfg, test.TestPeerID1, test.TestPeerName1) mpt.SetClient(mockRPCClient(t)) return mpt } @@ -210,7 +210,7 @@ func testSlowMapPinTracker(t testing.TB) *maptracker.MapPinTracker { func testMapPinTracker(t testing.TB) *maptracker.MapPinTracker { cfg := &maptracker.Config{} cfg.Default() - mpt := maptracker.NewMapPinTracker(cfg, test.TestPeerID1) + mpt := maptracker.NewMapPinTracker(cfg, test.TestPeerID1, test.TestPeerName1) mpt.SetClient(test.NewMockRPCClient(t)) return mpt } @@ -218,7 +218,7 @@ func testMapPinTracker(t testing.TB) *maptracker.MapPinTracker { func testSlowStatelessPinTracker(t testing.TB) *stateless.Tracker { cfg := &stateless.Config{} cfg.Default() - mpt := stateless.New(cfg, test.TestPeerID1) + mpt := stateless.New(cfg, test.TestPeerID1, test.TestPeerName1) mpt.SetClient(mockRPCClient(t)) return mpt } @@ -226,7 +226,7 @@ func testSlowStatelessPinTracker(t testing.TB) *stateless.Tracker { func testStatelessPinTracker(t testing.TB) *stateless.Tracker { cfg := &stateless.Config{} cfg.Default() - spt := stateless.New(cfg, test.TestPeerID1) + spt := stateless.New(cfg, test.TestPeerID1, test.TestPeerName1) spt.SetClient(test.NewMockRPCClient(t)) return spt } diff --git a/pintracker/stateless/stateless_test.go b/pintracker/stateless/stateless_test.go index 183ee9c8..e7dab51d 100644 --- a/pintracker/stateless/stateless_test.go +++ b/pintracker/stateless/stateless_test.go @@ -102,7 +102,7 @@ func (mock *mockService) PinGet(ctx context.Context, in api.PinSerial, out *api. func testSlowStatelessPinTracker(t *testing.T) *Tracker { cfg := &Config{} cfg.Default() - mpt := New(cfg, test.TestPeerID1) + mpt := New(cfg, test.TestPeerID1, test.TestPeerName1) mpt.SetClient(mockRPCClient(t)) return mpt } @@ -110,7 +110,7 @@ func testSlowStatelessPinTracker(t *testing.T) *Tracker { func testStatelessPinTracker(t testing.TB) *Tracker { cfg := &Config{} cfg.Default() - spt := New(cfg, test.TestPeerID1) + spt := New(cfg, test.TestPeerID1, test.TestPeerName1) spt.SetClient(test.NewMockRPCClient(t)) return spt } diff --git a/rpc_api.go b/rpc_api.go index 328d77c8..feb84f43 100644 --- a/rpc_api.go +++ b/rpc_api.go @@ -134,7 +134,6 @@ func (rpcapi *RPCAPI) Status(ctx context.Context, in api.PinSerial, out *api.Glo func (rpcapi *RPCAPI) StatusLocal(ctx context.Context, in api.PinSerial, out *api.PinInfoSerial) error { c := in.ToPin().Cid pinfo := rpcapi.c.StatusLocal(c) - pinfo.PeerName = rpcapi.c.config.Peername *out = pinfo.ToSerial() return nil } diff --git a/test/cids.go b/test/cids.go index 8262897b..55e43285 100644 --- a/test/cids.go +++ b/test/cids.go @@ -22,6 +22,13 @@ var ( TestPeerID4, _ = peer.IDB58Decode("QmZ8naDy5mEz4GLuQwjWt9MPYqHTBbsm8tQBrNSjiq6zBc") TestPeerID5, _ = peer.IDB58Decode("QmZVAo3wd8s5eTTy2kPYs34J9PvfxpKPuYsePPYGjgRRjg") TestPeerID6, _ = peer.IDB58Decode("QmR8Vu6kZk7JvAN2rWVWgiduHatgBq2bb15Yyq8RRhYSbx") + + TestPeerName1 = "TestPeer1" + TestPeerName2 = "TestPeer2" + TestPeerName3 = "TestPeer3" + TestPeerName4 = "TestPeer4" + TestPeerName5 = "TestPeer5" + TestPeerName6 = "TestPeer6" ) // MustDecodeCid provides a test helper that ignores