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

Improve bwagreement tests (#1149)

Browse Source
This commit is contained in:
Egon Elbre 2019-01-26 01:06:38 +02:00 committed by GitHub
parent f7e18882c4
commit 49dacb662c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/accounting/tally/tally_test.go
View File

@ -16,7 +16,7 @@ import (
"storj.io/storj/internal/teststorj" "storj.io/storj/internal/teststorj"
"storj.io/storj/pkg/accounting/tally" "storj.io/storj/pkg/accounting/tally"
"storj.io/storj/pkg/bwagreement" "storj.io/storj/pkg/bwagreement"
"storj.io/storj/pkg/bwagreement/test" "storj.io/storj/pkg/bwagreement/testbwagreement"
"storj.io/storj/pkg/identity" "storj.io/storj/pkg/identity"
"storj.io/storj/pkg/overlay/mocks" "storj.io/storj/pkg/overlay/mocks"
"storj.io/storj/pkg/pb" "storj.io/storj/pkg/pb"
@ -79,9 +79,9 @@ func TestQueryWithBw(t *testing.T) {
func makeBWA(ctx context.Context, t *testing.T, bwDb bwagreement.DB, serialNum string, fiC *identity.FullIdentity, action pb.PayerBandwidthAllocation_Action) { func makeBWA(ctx context.Context, t *testing.T, bwDb bwagreement.DB, serialNum string, fiC *identity.FullIdentity, action pb.PayerBandwidthAllocation_Action) {
//generate an agreement with the key //generate an agreement with the key
pba, err := test.GeneratePayerBandwidthAllocation(action, fiC, fiC, time.Hour) pba, err := testbwagreement.GeneratePayerBandwidthAllocation(action, fiC, fiC, time.Hour)
assert.NoError(t, err) assert.NoError(t, err)
rba, err := test.GenerateRenterBandwidthAllocation(pba, teststorj.NodeIDFromString("StorageNodeID"), fiC, 666) rba, err := testbwagreement.GenerateRenterBandwidthAllocation(pba, teststorj.NodeIDFromString("StorageNodeID"), fiC, 666)
assert.NoError(t, err) assert.NoError(t, err)
//save to db //save to db
err = bwDb.CreateAgreement(ctx, serialNum, bwagreement.Agreement{Signature: rba.GetSignature(), Agreement: rba.GetData()}) err = bwDb.CreateAgreement(ctx, serialNum, bwagreement.Agreement{Signature: rba.GetSignature(), Agreement: rba.GetData()})

39
pkg/bwagreement/test/server_test.go → pkg/bwagreement/server_test.go
View File

@ -1,7 +1,7 @@
// Copyright (C) 2019 Storj Labs, Inc. // Copyright (C) 2019 Storj Labs, Inc.
// See LICENSE for copying information. // See LICENSE for copying information.
package test package bwagreement_test
import ( import (
"context" "context"
@ -23,6 +23,7 @@ import (
"storj.io/storj/internal/testidentity" "storj.io/storj/internal/testidentity"
"storj.io/storj/pkg/auth" "storj.io/storj/pkg/auth"
"storj.io/storj/pkg/bwagreement" "storj.io/storj/pkg/bwagreement"
"storj.io/storj/pkg/bwagreement/testbwagreement"
"storj.io/storj/pkg/identity" "storj.io/storj/pkg/identity"
"storj.io/storj/pkg/pb" "storj.io/storj/pkg/pb"
"storj.io/storj/pkg/storj" "storj.io/storj/pkg/storj"
@ -65,15 +66,15 @@ func testDatabase(ctx context.Context, t *testing.T, bwdb bwagreement.DB) {
satellite := bwagreement.NewServer(bwdb, zap.NewNop(), satID.ID) satellite := bwagreement.NewServer(bwdb, zap.NewNop(), satID.ID)
{ // TestSameSerialNumberBandwidthAgreements { // TestSameSerialNumberBandwidthAgreements
pbaFile1, err := GeneratePayerBandwidthAllocation(pb.PayerBandwidthAllocation_GET, satID, upID, time.Hour) pbaFile1, err := testbwagreement.GeneratePayerBandwidthAllocation(pb.PayerBandwidthAllocation_GET, satID, upID, time.Hour)
assert.NoError(t, err) assert.NoError(t, err)
ctxSN1, storageNode1 := getPeerContext(ctx, t) ctxSN1, storageNode1 := getPeerContext(ctx, t)
rbaNode1, err := GenerateRenterBandwidthAllocation(pbaFile1, storageNode1, upID, 666) rbaNode1, err := testbwagreement.GenerateRenterBandwidthAllocation(pbaFile1, storageNode1, upID, 666)
assert.NoError(t, err) assert.NoError(t, err)
ctxSN2, storageNode2 := getPeerContext(ctx, t) ctxSN2, storageNode2 := getPeerContext(ctx, t)
rbaNode2, err := GenerateRenterBandwidthAllocation(pbaFile1, storageNode2, upID, 666) rbaNode2, err := testbwagreement.GenerateRenterBandwidthAllocation(pbaFile1, storageNode2, upID, 666)
assert.NoError(t, err) assert.NoError(t, err)
/* More than one storage node can submit bwagreements with the same serial number. /* More than one storage node can submit bwagreements with the same serial number.
@ -93,10 +94,10 @@ func testDatabase(ctx context.Context, t *testing.T, bwdb bwagreement.DB) {
/* Storage node can submit a second bwagreement with a different sequence value. /* Storage node can submit a second bwagreement with a different sequence value.
Uplink downloads another file. New PayerBandwidthAllocation with a new sequence. */ Uplink downloads another file. New PayerBandwidthAllocation with a new sequence. */
{ {
pbaFile2, err := GeneratePayerBandwidthAllocation(pb.PayerBandwidthAllocation_GET, satID, upID, time.Hour) pbaFile2, err := testbwagreement.GeneratePayerBandwidthAllocation(pb.PayerBandwidthAllocation_GET, satID, upID, time.Hour)
assert.NoError(t, err) assert.NoError(t, err)
rbaNode1, err := GenerateRenterBandwidthAllocation(pbaFile2, storageNode1, upID, 666) rbaNode1, err := testbwagreement.GenerateRenterBandwidthAllocation(pbaFile2, storageNode1, upID, 666)
assert.NoError(t, err) assert.NoError(t, err)
reply, err := satellite.BandwidthAgreements(ctxSN1, rbaNode1) reply, err := satellite.BandwidthAgreements(ctxSN1, rbaNode1)
@ -106,7 +107,7 @@ func testDatabase(ctx context.Context, t *testing.T, bwdb bwagreement.DB) {
/* Storage nodes can't submit a second bwagreement with the same sequence. */ /* Storage nodes can't submit a second bwagreement with the same sequence. */
{ {
rbaNode1, err := GenerateRenterBandwidthAllocation(pbaFile1, storageNode1, upID, 666) rbaNode1, err := testbwagreement.GenerateRenterBandwidthAllocation(pbaFile1, storageNode1, upID, 666)
assert.NoError(t, err) assert.NoError(t, err)
reply, err := satellite.BandwidthAgreements(ctxSN1, rbaNode1) reply, err := satellite.BandwidthAgreements(ctxSN1, rbaNode1)
@ -125,12 +126,12 @@ func testDatabase(ctx context.Context, t *testing.T, bwdb bwagreement.DB) {
} }
{ // TestExpiredBandwidthAgreements { // TestExpiredBandwidthAgreements
{ // storage nodes can submit a bwagreement that will expire in one second { // storage nodes can submit a bwagreement that will expire in 30 seconds
pba, err := GeneratePayerBandwidthAllocation(pb.PayerBandwidthAllocation_GET, satID, upID, time.Second) pba, err := testbwagreement.GeneratePayerBandwidthAllocation(pb.PayerBandwidthAllocation_GET, satID, upID, 30*time.Second)
assert.NoError(t, err) assert.NoError(t, err)
ctxSN1, storageNode1 := getPeerContext(ctx, t) ctxSN1, storageNode1 := getPeerContext(ctx, t)
rba, err := GenerateRenterBandwidthAllocation(pba, storageNode1, upID, 666) rba, err := testbwagreement.GenerateRenterBandwidthAllocation(pba, storageNode1, upID, 666)
assert.NoError(t, err) assert.NoError(t, err)
reply, err := satellite.BandwidthAgreements(ctxSN1, rba) reply, err := satellite.BandwidthAgreements(ctxSN1, rba)
@ -139,11 +140,11 @@ func testDatabase(ctx context.Context, t *testing.T, bwdb bwagreement.DB) {
} }
{ // storage nodes can't submit a bwagreement that expires right now { // storage nodes can't submit a bwagreement that expires right now
pba, err := GeneratePayerBandwidthAllocation(pb.PayerBandwidthAllocation_GET, satID, upID, 0*time.Second) pba, err := testbwagreement.GeneratePayerBandwidthAllocation(pb.PayerBandwidthAllocation_GET, satID, upID, 0*time.Second)
assert.NoError(t, err) assert.NoError(t, err)
ctxSN1, storageNode1 := getPeerContext(ctx, t) ctxSN1, storageNode1 := getPeerContext(ctx, t)
rba, err := GenerateRenterBandwidthAllocation(pba, storageNode1, upID, 666) rba, err := testbwagreement.GenerateRenterBandwidthAllocation(pba, storageNode1, upID, 666)
assert.NoError(t, err) assert.NoError(t, err)
reply, err := satellite.BandwidthAgreements(ctxSN1, rba) reply, err := satellite.BandwidthAgreements(ctxSN1, rba)
@ -152,11 +153,11 @@ func testDatabase(ctx context.Context, t *testing.T, bwdb bwagreement.DB) {
} }
{ // storage nodes can't submit a bwagreement that expires yesterday { // storage nodes can't submit a bwagreement that expires yesterday
pba, err := GeneratePayerBandwidthAllocation(pb.PayerBandwidthAllocation_GET, satID, upID, -23*time.Hour-55*time.Second) pba, err := testbwagreement.GeneratePayerBandwidthAllocation(pb.PayerBandwidthAllocation_GET, satID, upID, -23*time.Hour-55*time.Second)
assert.NoError(t, err) assert.NoError(t, err)
ctxSN1, storageNode1 := getPeerContext(ctx, t) ctxSN1, storageNode1 := getPeerContext(ctx, t)
rba, err := GenerateRenterBandwidthAllocation(pba, storageNode1, upID, 666) rba, err := testbwagreement.GenerateRenterBandwidthAllocation(pba, storageNode1, upID, 666)
assert.NoError(t, err) assert.NoError(t, err)
reply, err := satellite.BandwidthAgreements(ctxSN1, rba) reply, err := satellite.BandwidthAgreements(ctxSN1, rba)
@ -166,13 +167,13 @@ func testDatabase(ctx context.Context, t *testing.T, bwdb bwagreement.DB) {
} }
{ // TestManipulatedBandwidthAgreements { // TestManipulatedBandwidthAgreements
pba, err := GeneratePayerBandwidthAllocation(pb.PayerBandwidthAllocation_GET, satID, upID, time.Hour) pba, err := testbwagreement.GeneratePayerBandwidthAllocation(pb.PayerBandwidthAllocation_GET, satID, upID, time.Hour)
if !assert.NoError(t, err) { if !assert.NoError(t, err) {
t.Fatal(err) t.Fatal(err)
} }
ctxSN1, storageNode1 := getPeerContext(ctx, t) ctxSN1, storageNode1 := getPeerContext(ctx, t)
rba, err := GenerateRenterBandwidthAllocation(pba, storageNode1, upID, 666) rba, err := testbwagreement.GenerateRenterBandwidthAllocation(pba, storageNode1, upID, 666)
assert.NoError(t, err) assert.NoError(t, err)
// Unmarschal Renter and Payer bwagreements // Unmarschal Renter and Payer bwagreements
@ -354,11 +355,11 @@ func testDatabase(ctx context.Context, t *testing.T, bwdb bwagreement.DB) {
{ //TestInvalidBandwidthAgreements { //TestInvalidBandwidthAgreements
ctxSN1, storageNode1 := getPeerContext(ctx, t) ctxSN1, storageNode1 := getPeerContext(ctx, t)
ctxSN2, storageNode2 := getPeerContext(ctx, t) ctxSN2, storageNode2 := getPeerContext(ctx, t)
pba, err := GeneratePayerBandwidthAllocation(pb.PayerBandwidthAllocation_GET, satID, upID, time.Hour) pba, err := testbwagreement.GeneratePayerBandwidthAllocation(pb.PayerBandwidthAllocation_GET, satID, upID, time.Hour)
assert.NoError(t, err) assert.NoError(t, err)
{ // Storage node sends an corrupted signuature to force a satellite crash { // Storage node sends an corrupted signuature to force a satellite crash
rba, err := GenerateRenterBandwidthAllocation(pba, storageNode1, upID, 666) rba, err := testbwagreement.GenerateRenterBandwidthAllocation(pba, storageNode1, upID, 666)
assert.NoError(t, err) assert.NoError(t, err)
rba.Signature = []byte("invalid") rba.Signature = []byte("invalid")
@ -369,7 +370,7 @@ func testDatabase(ctx context.Context, t *testing.T, bwdb bwagreement.DB) {
} }
{ // Storage node sends an corrupted uplink Certs to force a crash { // Storage node sends an corrupted uplink Certs to force a crash
rba, err := GenerateRenterBandwidthAllocation(pba, storageNode2, upID, 666) rba, err := testbwagreement.GenerateRenterBandwidthAllocation(pba, storageNode2, upID, 666)
assert.NoError(t, err) assert.NoError(t, err)
rbaData := &pb.RenterBandwidthAllocation_Data{} rbaData := &pb.RenterBandwidthAllocation_Data{}

2
pkg/bwagreement/test/common.go → pkg/bwagreement/testbwagreement/common.go
View File

@ -1,7 +1,7 @@
// Copyright (C) 2019 Storj Labs, Inc. // Copyright (C) 2019 Storj Labs, Inc.
// See LICENSE for copying information. // See LICENSE for copying information.
package test package testbwagreement
import ( import (
"crypto/ecdsa" "crypto/ecdsa"

14
pkg/piecestore/psserver/server_test.go
View File

@ -26,7 +26,7 @@ import (
"storj.io/storj/internal/testcontext" "storj.io/storj/internal/testcontext"
"storj.io/storj/internal/testidentity" "storj.io/storj/internal/testidentity"
"storj.io/storj/pkg/bwagreement/test" "storj.io/storj/pkg/bwagreement/testbwagreement"
"storj.io/storj/pkg/identity" "storj.io/storj/pkg/identity"
"storj.io/storj/pkg/pb" "storj.io/storj/pkg/pb"
pstore "storj.io/storj/pkg/piecestore" pstore "storj.io/storj/pkg/piecestore"
@ -233,7 +233,7 @@ func TestRetrieve(t *testing.T) {
err = stream.Send(&pb.PieceRetrieval{PieceData: &pb.PieceRetrieval_PieceData{Id: tt.id, PieceSize: tt.reqSize, Offset: tt.offset}}) err = stream.Send(&pb.PieceRetrieval{PieceData: &pb.PieceRetrieval_PieceData{Id: tt.id, PieceSize: tt.reqSize, Offset: tt.offset}})
assert.NoError(err) assert.NoError(err)
pba, err := test.GeneratePayerBandwidthAllocation(pb.PayerBandwidthAllocation_GET, snID, upID, time.Hour) pba, err := testbwagreement.GeneratePayerBandwidthAllocation(pb.PayerBandwidthAllocation_GET, snID, upID, time.Hour)
assert.NoError(err) assert.NoError(err)
totalAllocated := int64(0) totalAllocated := int64(0)
@ -244,7 +244,7 @@ func TestRetrieve(t *testing.T) {
// Send bandwidth bandwidthAllocation // Send bandwidth bandwidthAllocation
totalAllocated += tt.allocSize totalAllocated += tt.allocSize
rba, err := test.GenerateRenterBandwidthAllocation(pba, snID.ID, upID, totalAllocated) rba, err := testbwagreement.GenerateRenterBandwidthAllocation(pba, snID.ID, upID, totalAllocated)
assert.NoError(err) assert.NoError(err)
err = stream.Send( err = stream.Send(
@ -342,9 +342,9 @@ func TestStore(t *testing.T) {
err = stream.Send(&pb.PieceStore{PieceData: &pb.PieceStore_PieceData{Id: tt.id, ExpirationUnixSec: tt.ttl}}) err = stream.Send(&pb.PieceStore{PieceData: &pb.PieceStore_PieceData{Id: tt.id, ExpirationUnixSec: tt.ttl}})
assert.NoError(err) assert.NoError(err)
// Send Bandwidth Allocation Data // Send Bandwidth Allocation Data
pba, err := test.GeneratePayerBandwidthAllocation(pb.PayerBandwidthAllocation_PUT, snID, upID, time.Hour) pba, err := testbwagreement.GeneratePayerBandwidthAllocation(pb.PayerBandwidthAllocation_PUT, snID, upID, time.Hour)
assert.NoError(err) assert.NoError(err)
rba, err := test.GenerateRenterBandwidthAllocation(pba, snID.ID, upID, tt.totalReceived) rba, err := testbwagreement.GenerateRenterBandwidthAllocation(pba, snID.ID, upID, tt.totalReceived)
assert.NoError(err) assert.NoError(err)
msg := &pb.PieceStore{ msg := &pb.PieceStore{
PieceData: &pb.PieceStore_PieceData{Content: tt.content}, PieceData: &pb.PieceStore_PieceData{Content: tt.content},
@ -464,9 +464,9 @@ func TestPbaValidation(t *testing.T) {
assert.NoError(err) assert.NoError(err)
// Send Bandwidth Allocation Data // Send Bandwidth Allocation Data
content := []byte("content") content := []byte("content")
pba, err := test.GeneratePayerBandwidthAllocation(tt.action, satID1, upID, time.Hour) pba, err := testbwagreement.GeneratePayerBandwidthAllocation(tt.action, satID1, upID, time.Hour)
assert.NoError(err) assert.NoError(err)
rba, err := test.GenerateRenterBandwidthAllocation(pba, snID.ID, upID, int64(len(content))) rba, err := testbwagreement.GenerateRenterBandwidthAllocation(pba, snID.ID, upID, int64(len(content)))
assert.NoError(err) assert.NoError(err)
msg := &pb.PieceStore{ msg := &pb.PieceStore{
PieceData: &pb.PieceStore_PieceData{Content: content}, PieceData: &pb.PieceStore_PieceData{Content: content},