diff --git a/chain/address/address_test.go b/chain/address/address_test.go index ad2bd164d..bf77b974a 100644 --- a/chain/address/address_test.go +++ b/chain/address/address_test.go @@ -11,7 +11,6 @@ import ( "time" ffi "github.com/filecoin-project/filecoin-ffi" - "github.com/filecoin-project/go-bls-sigs" "github.com/multiformats/go-varint" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/chain/deals/request_validation_test.go b/chain/deals/request_validation_test.go index 01005d10d..87f41c8f5 100644 --- a/chain/deals/request_validation_test.go +++ b/chain/deals/request_validation_test.go @@ -127,7 +127,7 @@ func TestClientRequestValidation(t *testing.T) { if err != nil { t.Fatal("unable to construct piece cid") } - if !xerrors.Is(crv.ValidatePull(minerID, &deals.StorageDataTransferVoucher{proposalNd.Cid()}, pieceRef, nil), deals.ErrNoDeal) { + if !xerrors.Is(crv.ValidatePull(minerID, &deals.StorageDataTransferVoucher{proposalNd.Cid(), 1}, pieceRef, nil), deals.ErrNoDeal) { t.Fatal("Pull should fail if there is no deal stored") } }) @@ -144,7 +144,7 @@ func TestClientRequestValidation(t *testing.T) { if err != nil { t.Fatal("unable to construct piece cid") } - if !xerrors.Is(crv.ValidatePull(minerID, &deals.StorageDataTransferVoucher{clientDeal.ProposalCid}, pieceRef, nil), deals.ErrWrongPeer) { + if !xerrors.Is(crv.ValidatePull(minerID, &deals.StorageDataTransferVoucher{clientDeal.ProposalCid, 1}, pieceRef, nil), deals.ErrWrongPeer) { t.Fatal("Pull should fail if miner address is incorrect") } }) @@ -156,7 +156,7 @@ func TestClientRequestValidation(t *testing.T) { if err := state.Begin(clientDeal.ProposalCid, &clientDeal); err != nil { t.Fatal("deal tracking failed") } - if !xerrors.Is(crv.ValidatePull(minerID, &deals.StorageDataTransferVoucher{clientDeal.ProposalCid}, blockGenerator.Next().Cid(), nil), deals.ErrWrongPiece) { + if !xerrors.Is(crv.ValidatePull(minerID, &deals.StorageDataTransferVoucher{clientDeal.ProposalCid, 1}, blockGenerator.Next().Cid(), nil), deals.ErrWrongPiece) { t.Fatal("Pull should fail if piece ref is incorrect") } }) @@ -172,7 +172,7 @@ func TestClientRequestValidation(t *testing.T) { if err != nil { t.Fatal("unable to construct piece cid") } - if !xerrors.Is(crv.ValidatePull(minerID, &deals.StorageDataTransferVoucher{clientDeal.ProposalCid}, pieceRef, nil), deals.ErrInacceptableDealState) { + if !xerrors.Is(crv.ValidatePull(minerID, &deals.StorageDataTransferVoucher{clientDeal.ProposalCid, 1}, pieceRef, nil), deals.ErrInacceptableDealState) { t.Fatal("Pull should fail if deal is in a state that cannot be data transferred") } }) @@ -188,7 +188,7 @@ func TestClientRequestValidation(t *testing.T) { if err != nil { t.Fatal("unable to construct piece cid") } - if crv.ValidatePull(minerID, &deals.StorageDataTransferVoucher{clientDeal.ProposalCid}, pieceRef, nil) != nil { + if crv.ValidatePull(minerID, &deals.StorageDataTransferVoucher{clientDeal.ProposalCid, 1}, pieceRef, nil) != nil { t.Fatal("Pull should should succeed when all parameters are correct") } }) @@ -220,7 +220,7 @@ func TestProviderRequestValidation(t *testing.T) { if err != nil { t.Fatal("unable to construct piece cid") } - if !xerrors.Is(mrv.ValidatePush(clientID, &deals.StorageDataTransferVoucher{proposalNd.Cid()}, pieceRef, nil), deals.ErrNoDeal) { + if !xerrors.Is(mrv.ValidatePush(clientID, &deals.StorageDataTransferVoucher{proposalNd.Cid(), 1}, pieceRef, nil), deals.ErrNoDeal) { t.Fatal("Push should fail if there is no deal stored") } }) @@ -237,7 +237,7 @@ func TestProviderRequestValidation(t *testing.T) { if err != nil { t.Fatal("unable to construct piece cid") } - if !xerrors.Is(mrv.ValidatePush(clientID, &deals.StorageDataTransferVoucher{minerDeal.ProposalCid}, pieceRef, nil), deals.ErrWrongPeer) { + if !xerrors.Is(mrv.ValidatePush(clientID, &deals.StorageDataTransferVoucher{minerDeal.ProposalCid, 1}, pieceRef, nil), deals.ErrWrongPeer) { t.Fatal("Push should fail if miner address is incorrect") } }) @@ -249,7 +249,7 @@ func TestProviderRequestValidation(t *testing.T) { if err := state.Begin(minerDeal.ProposalCid, &minerDeal); err != nil { t.Fatal("deal tracking failed") } - if !xerrors.Is(mrv.ValidatePush(clientID, &deals.StorageDataTransferVoucher{minerDeal.ProposalCid}, blockGenerator.Next().Cid(), nil), deals.ErrWrongPiece) { + if !xerrors.Is(mrv.ValidatePush(clientID, &deals.StorageDataTransferVoucher{minerDeal.ProposalCid, 1}, blockGenerator.Next().Cid(), nil), deals.ErrWrongPiece) { t.Fatal("Push should fail if piece ref is incorrect") } }) @@ -265,7 +265,7 @@ func TestProviderRequestValidation(t *testing.T) { if err != nil { t.Fatal("unable to construct piece cid") } - if !xerrors.Is(mrv.ValidatePush(clientID, &deals.StorageDataTransferVoucher{minerDeal.ProposalCid}, pieceRef, nil), deals.ErrInacceptableDealState) { + if !xerrors.Is(mrv.ValidatePush(clientID, &deals.StorageDataTransferVoucher{minerDeal.ProposalCid, 1}, pieceRef, nil), deals.ErrInacceptableDealState) { t.Fatal("Push should fail if deal is in a state that cannot be data transferred") } }) @@ -281,7 +281,7 @@ func TestProviderRequestValidation(t *testing.T) { if err != nil { t.Fatal("unable to construct piece cid") } - if mrv.ValidatePush(clientID, &deals.StorageDataTransferVoucher{minerDeal.ProposalCid}, pieceRef, nil) != nil { + if mrv.ValidatePush(clientID, &deals.StorageDataTransferVoucher{minerDeal.ProposalCid, 1}, pieceRef, nil) != nil { t.Fatal("Push should should succeed when all parameters are correct") } })