JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

assert.NoError() -> require.NoError() in kademlia tests (#1608)

Browse Source
This commit is contained in:
paul cannon 2019-03-29 12:16:59 -06:00 committed by Egon Elbre
parent 66a7d6bf3a
commit 857edee485
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
pkg/kademlia/kademlia_test.go
View File

@ -93,7 +93,7 @@ func TestPeerDiscovery(t *testing.T) {
Wallet: "OperatorWallet", Wallet: "OperatorWallet",
} }
k, err := newKademlia(zaptest.NewLogger(t), pb.NodeType_STORAGE, bootstrapNodes, testAddress, metadata, testID, ctx.Dir("test"), defaultAlpha) k, err := newKademlia(zaptest.NewLogger(t), pb.NodeType_STORAGE, bootstrapNodes, testAddress, metadata, testID, ctx.Dir("test"), defaultAlpha)
assert.NoError(t, err) require.NoError(t, err)
rt := k.routingTable rt := k.routingTable
assert.Equal(t, rt.Local().Metadata.Wallet, "OperatorWallet") assert.Equal(t, rt.Local().Metadata.Wallet, "OperatorWallet")
@ -135,33 +135,33 @@ func TestBootstrap(t *testing.T) {
defer s1.GracefulStop() defer s1.GracefulStop()
err := n1.Bootstrap(ctx) err := n1.Bootstrap(ctx)
assert.NoError(t, err) require.NoError(t, err)
n2, s2, clean2 := testNode(ctx, "3", t, []pb.Node{bn.routingTable.self}) n2, s2, clean2 := testNode(ctx, "3", t, []pb.Node{bn.routingTable.self})
defer clean2() defer clean2()
defer s2.GracefulStop() defer s2.GracefulStop()
err = n2.Bootstrap(ctx) err = n2.Bootstrap(ctx)
assert.NoError(t, err) require.NoError(t, err)
nodeIDs, err := n2.routingTable.nodeBucketDB.List(nil, 0) nodeIDs, err := n2.routingTable.nodeBucketDB.List(nil, 0)
assert.NoError(t, err) require.NoError(t, err)
assert.Len(t, nodeIDs, 3) assert.Len(t, nodeIDs, 3)
} }
func testNode(ctx *testcontext.Context, name string, t *testing.T, bn []pb.Node) (*Kademlia, *grpc.Server, func()) { func testNode(ctx *testcontext.Context, name string, t *testing.T, bn []pb.Node) (*Kademlia, *grpc.Server, func()) {
// new address // new address
lis, err := net.Listen("tcp", "127.0.0.1:0") lis, err := net.Listen("tcp", "127.0.0.1:0")
assert.NoError(t, err) require.NoError(t, err)
// new config // new config
// new identity // new identity
fid, err := testidentity.NewTestIdentity(ctx) fid, err := testidentity.NewTestIdentity(ctx)
assert.NoError(t, err) require.NoError(t, err)
// new kademlia // new kademlia
logger := zaptest.NewLogger(t) logger := zaptest.NewLogger(t)
k, err := newKademlia(logger, pb.NodeType_STORAGE, bn, lis.Addr().String(), nil, fid, ctx.Dir(name), defaultAlpha) k, err := newKademlia(logger, pb.NodeType_STORAGE, bn, lis.Addr().String(), nil, fid, ctx.Dir(name), defaultAlpha)
assert.NoError(t, err) require.NoError(t, err)
s := NewEndpoint(logger, k, k.routingTable) s := NewEndpoint(logger, k, k.routingTable)
// new ident opts // new ident opts
@ -198,18 +198,18 @@ func TestRefresh(t *testing.T) {
now := time.Now().UTC() now := time.Now().UTC()
bID := firstBucketID //always exists bID := firstBucketID //always exists
err := rt.SetBucketTimestamp(bID[:], now.Add(-2*time.Hour)) err := rt.SetBucketTimestamp(bID[:], now.Add(-2*time.Hour))
assert.NoError(t, err) require.NoError(t, err)
//refresh should call FindNode, updating the time //refresh should call FindNode, updating the time
err = k.refresh(ctx, time.Minute) err = k.refresh(ctx, time.Minute)
assert.NoError(t, err) require.NoError(t, err)
ts1, err := rt.GetBucketTimestamp(bID[:]) ts1, err := rt.GetBucketTimestamp(bID[:])
assert.NoError(t, err) require.NoError(t, err)
assert.True(t, now.Add(-5*time.Minute).Before(ts1)) assert.True(t, now.Add(-5*time.Minute).Before(ts1))
//refresh should not call FindNode, leaving the previous time //refresh should not call FindNode, leaving the previous time
err = k.refresh(ctx, time.Minute) err = k.refresh(ctx, time.Minute)
assert.NoError(t, err) require.NoError(t, err)
ts2, err := rt.GetBucketTimestamp(bID[:]) ts2, err := rt.GetBucketTimestamp(bID[:])
assert.NoError(t, err) require.NoError(t, err)
assert.True(t, ts1.Equal(ts2)) assert.True(t, ts1.Equal(ts2))
s.GracefulStop() s.GracefulStop()
} }
@ -220,14 +220,14 @@ func TestFindNear(t *testing.T) {
// make new identity // make new identity
fid, err := testidentity.NewTestIdentity(ctx) fid, err := testidentity.NewTestIdentity(ctx)
assert.NoError(t, err) require.NoError(t, err)
fid2, err := testidentity.NewTestIdentity(ctx) fid2, err := testidentity.NewTestIdentity(ctx)
assert.NoError(t, err) require.NoError(t, err)
assert.NotEqual(t, fid.ID, fid2.ID) assert.NotEqual(t, fid.ID, fid2.ID)
//start kademlia //start kademlia
lis, err := net.Listen("tcp", "127.0.0.1:0") lis, err := net.Listen("tcp", "127.0.0.1:0")
assert.NoError(t, err) require.NoError(t, err)
srv, _ := newTestServer(ctx, []*pb.Node{{Id: teststorj.NodeIDFromString("foo")}}) srv, _ := newTestServer(ctx, []*pb.Node{{Id: teststorj.NodeIDFromString("foo")}})
defer srv.Stop() defer srv.Stop()
@ -242,7 +242,7 @@ func TestFindNear(t *testing.T) {
bootstrap := []pb.Node{{Id: fid2.ID, Address: &pb.NodeAddress{Address: lis.Addr().String()}}} bootstrap := []pb.Node{{Id: fid2.ID, Address: &pb.NodeAddress{Address: lis.Addr().String()}}}
k, err := newKademlia(zaptest.NewLogger(t), pb.NodeType_STORAGE, bootstrap, k, err := newKademlia(zaptest.NewLogger(t), pb.NodeType_STORAGE, bootstrap,
lis.Addr().String(), nil, fid, ctx.Dir("kademlia"), defaultAlpha) lis.Addr().String(), nil, fid, ctx.Dir("kademlia"), defaultAlpha)
assert.NoError(t, err) require.NoError(t, err)
defer ctx.Check(k.Close) defer ctx.Check(k.Close)
// add nodes // add nodes
@ -286,7 +286,7 @@ func TestFindNear(t *testing.T) {
t.Run(c.testID, func(t *testing.T) { t.Run(c.testID, func(t *testing.T) {
ns, err := k.FindNear(ctx, c.target, c.limit, c.restrictions...) ns, err := k.FindNear(ctx, c.target, c.limit, c.restrictions...)
assert.NoError(t, err) require.NoError(t, err)
assert.Equal(t, len(c.expected), len(ns)) assert.Equal(t, len(c.expected), len(ns))
for _, e := range c.expected { for _, e := range c.expected {
found := false found := false
@ -465,7 +465,7 @@ func TestRandomIds(t *testing.T) {
start, end = end, start start, end = end, start
} }
id, err := randomIDInRange(start, end) id, err := randomIDInRange(start, end)
assert.NoError(t, err, "Unexpected err in randomIDInRange") require.NoError(t, err, "Unexpected err in randomIDInRange")
assert.True(t, bytes.Compare(id[:], start[:]) > 0, "Random id was less than starting id") assert.True(t, bytes.Compare(id[:], start[:]) > 0, "Random id was less than starting id")
assert.True(t, bytes.Compare(id[:], end[:]) <= 0, "Random id was greater than end id") assert.True(t, bytes.Compare(id[:], end[:]) <= 0, "Random id was greater than end id")
//invalid range //invalid range
@ -482,7 +482,7 @@ func TestRandomIds(t *testing.T) {
end[31] = start[31] + 1 end[31] = start[31] + 1
} }
id, err = randomIDInRange(start, end) id, err = randomIDInRange(start, end)
assert.NoError(t, err, "Unexpected err in randomIDInRange") require.NoError(t, err, "Unexpected err in randomIDInRange")
assert.True(t, bytes.Equal(id[:], end[:]), "Not-so-random id was incorrect") assert.True(t, bytes.Equal(id[:], end[:]), "Not-so-random id was incorrect")
} }
} }