cerc-io/lotus
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

fix(datatransfer): rebase fixes

Browse Source 
Fixes after rebase on interactive porep
This commit is contained in:
hannahhoward 2019-11-07 11:23:57 -08:00
parent ca5032937c
commit dcb35d90df
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
chain/deals/request_validation_test.go
View File

@ -18,7 +18,7 @@ import (
"github.com/filecoin-project/lotus/chain/address" "github.com/filecoin-project/lotus/chain/address"
"github.com/filecoin-project/lotus/chain/deals" "github.com/filecoin-project/lotus/chain/deals"
"github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/chain/types"
"github.com/filecoin-project/lotus/lib/cborrpc" "github.com/filecoin-project/lotus/lib/cborutil"
"github.com/filecoin-project/lotus/lib/statestore" "github.com/filecoin-project/lotus/lib/statestore"
) )
@ -59,19 +59,22 @@ func uniqueStorageDealProposal() (actors.StorageDealProposal, error) {
}, nil }, nil
} }
func newClientDeal(minerId peer.ID, state api.DealState) (deals.ClientDeal, error) { func newClientDeal(minerID peer.ID, state api.DealState) (deals.ClientDeal, error) {
newProposal, err := uniqueStorageDealProposal() newProposal, err := uniqueStorageDealProposal()
if err != nil { if err != nil {
return deals.ClientDeal{}, err return deals.ClientDeal{}, err
} }
proposalNd, err := cborrpc.AsIpld(&newProposal) proposalNd, err := cborutil.AsIpld(&newProposal)
if err != nil { if err != nil {
return deals.ClientDeal{}, err return deals.ClientDeal{}, err
} }
minerAddr, err := address.NewIDAddress(uint64(rand.Int()))
return deals.ClientDeal{ return deals.ClientDeal{
Proposal: newProposal, Proposal: newProposal,
ProposalCid: proposalNd.Cid(), ProposalCid: proposalNd.Cid(),
Miner: minerId, Miner: minerID,
MinerWorker: minerAddr,
State: state, State: state,
}, nil }, nil
} }
@ -81,7 +84,7 @@ func newMinerDeal(clientID peer.ID, state api.DealState) (deals.MinerDeal, error
if err != nil { if err != nil {
return deals.MinerDeal{}, err return deals.MinerDeal{}, err
} }
proposalNd, err := cborrpc.AsIpld(&newProposal) proposalNd, err := cborutil.AsIpld(&newProposal)
if err != nil { if err != nil {
return deals.MinerDeal{}, err return deals.MinerDeal{}, err
} }
@ -89,6 +92,7 @@ func newMinerDeal(clientID peer.ID, state api.DealState) (deals.MinerDeal, error
if err != nil { if err != nil {
return deals.MinerDeal{}, err return deals.MinerDeal{}, err
} }
return deals.MinerDeal{ return deals.MinerDeal{
Proposal: newProposal, Proposal: newProposal,
ProposalCid: proposalNd.Cid(), ProposalCid: proposalNd.Cid(),
@ -103,10 +107,10 @@ func TestClientRequestValidation(t *testing.T) {
state := statestore.New(namespace.Wrap(ds, datastore.NewKey("/deals/client"))) state := statestore.New(namespace.Wrap(ds, datastore.NewKey("/deals/client")))
crv := deals.NewClientRequestValidator(ds) crv := deals.NewClientRequestValidator(ds)
minerId := peer.ID("fakepeerid") minerID := peer.ID("fakepeerid")
block := blockGenerator.Next() block := blockGenerator.Next()
t.Run("ValidatePush fails", func(t *testing.T) { t.Run("ValidatePush fails", func(t *testing.T) {
if !xerrors.Is(crv.ValidatePush(minerId, wrongDTType{}, block.Cid(), nil), deals.ErrNoPushAccepted) { if !xerrors.Is(crv.ValidatePush(minerID, wrongDTType{}, block.Cid(), nil), deals.ErrNoPushAccepted) {
t.Fatal("Push should fail for the client request validator for storage deals") t.Fatal("Push should fail for the client request validator for storage deals")
} }
}) })
@ -115,7 +119,7 @@ func TestClientRequestValidation(t *testing.T) {
if err != nil { if err != nil {
t.Fatal("error creating proposal") t.Fatal("error creating proposal")
} }
proposalNd, err := cborrpc.AsIpld(&proposal) proposalNd, err := cborutil.AsIpld(&proposal)
if err != nil { if err != nil {
t.Fatal("error serializing proposal") t.Fatal("error serializing proposal")
} }
@ -123,7 +127,7 @@ func TestClientRequestValidation(t *testing.T) {
if err != nil { if err != nil {
t.Fatal("unable to construct piece cid") 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()}, pieceRef, nil), deals.ErrNoDeal) {
t.Fatal("Pull should fail if there is no deal stored") t.Fatal("Pull should fail if there is no deal stored")
} }
}) })
@ -140,24 +144,24 @@ func TestClientRequestValidation(t *testing.T) {
if err != nil { if err != nil {
t.Fatal("unable to construct piece cid") 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}, pieceRef, nil), deals.ErrWrongPeer) {
t.Fatal("Pull should fail if miner address is incorrect") t.Fatal("Pull should fail if miner address is incorrect")
} }
}) })
t.Run("ValidatePull fails wrong piece ref", func(t *testing.T) { t.Run("ValidatePull fails wrong piece ref", func(t *testing.T) {
clientDeal, err := newClientDeal(minerId, api.DealAccepted) clientDeal, err := newClientDeal(minerID, api.DealAccepted)
if err != nil { if err != nil {
t.Fatal("error creating client deal") t.Fatal("error creating client deal")
} }
if err := state.Begin(clientDeal.ProposalCid, &clientDeal); err != nil { if err := state.Begin(clientDeal.ProposalCid, &clientDeal); err != nil {
t.Fatal("deal tracking failed") 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}, blockGenerator.Next().Cid(), nil), deals.ErrWrongPiece) {
t.Fatal("Pull should fail if piece ref is incorrect") t.Fatal("Pull should fail if piece ref is incorrect")
} }
}) })
t.Run("ValidatePull fails wrong deal state", func(t *testing.T) { t.Run("ValidatePull fails wrong deal state", func(t *testing.T) {
clientDeal, err := newClientDeal(minerId, api.DealComplete) clientDeal, err := newClientDeal(minerID, api.DealComplete)
if err != nil { if err != nil {
t.Fatal("error creating client deal") t.Fatal("error creating client deal")
} }
@ -168,12 +172,12 @@ func TestClientRequestValidation(t *testing.T) {
if err != nil { if err != nil {
t.Fatal("unable to construct piece cid") 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}, pieceRef, nil), deals.ErrInacceptableDealState) {
t.Fatal("Pull should fail if deal is in a state that cannot be data transferred") t.Fatal("Pull should fail if deal is in a state that cannot be data transferred")
} }
}) })
t.Run("ValidatePull succeeds", func(t *testing.T) { t.Run("ValidatePull succeeds", func(t *testing.T) {
clientDeal, err := newClientDeal(minerId, api.DealAccepted) clientDeal, err := newClientDeal(minerID, api.DealAccepted)
if err != nil { if err != nil {
t.Fatal("error creating client deal") t.Fatal("error creating client deal")
} }
@ -184,7 +188,7 @@ func TestClientRequestValidation(t *testing.T) {
if err != nil { if err != nil {
t.Fatal("unable to construct piece cid") 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}, pieceRef, nil) != nil {
t.Fatal("Pull should should succeed when all parameters are correct") t.Fatal("Pull should should succeed when all parameters are correct")
} }
}) })
@ -208,7 +212,7 @@ func TestProviderRequestValidation(t *testing.T) {
if err != nil { if err != nil {
t.Fatal("error creating proposal") t.Fatal("error creating proposal")
} }
proposalNd, err := cborrpc.AsIpld(&proposal) proposalNd, err := cborutil.AsIpld(&proposal)
if err != nil { if err != nil {
t.Fatal("error serializing proposal") t.Fatal("error serializing proposal")
} }