diff --git a/.circleci/config.yml b/.circleci/config.yml index 8684c3f3..fd17e6ee 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2.1 orbs: go: gotest/tools@0.0.9 codecov: codecov/codecov@1.0.2 - node: circleci/node@3.0.0 + node: circleci/node@4.5.1 executors: golang: diff --git a/retrievalmarket/impl/integration_test.go b/retrievalmarket/impl/integration_test.go index 3a2fe90f..6c5ad795 100644 --- a/retrievalmarket/impl/integration_test.go +++ b/retrievalmarket/impl/integration_test.go @@ -424,7 +424,7 @@ func TestClientCanMakeDealWithProvider(t *testing.T) { } // ------- SET UP CLIENT - ctx, cancel := context.WithTimeout(bgCtx, 10*time.Second) + ctx, cancel := context.WithTimeout(bgCtx, 60*time.Second) defer cancel() provider := setupProvider(bgCtx, t, testData, payloadCID, pieceInfo, expectedQR, @@ -550,11 +550,12 @@ CurrentInterval: %d } assert.Equal(t, retrievalmarket.DealStatusCompleted, clientDealState.Status) } - ctx, cancel = context.WithTimeout(bgCtx, 5*time.Second) - defer cancel() + + ctxProv, cancelProv := context.WithTimeout(bgCtx, 10*time.Second) + defer cancelProv() var providerDealState retrievalmarket.ProviderDealState select { - case <-ctx.Done(): + case <-ctxProv.Done(): t.Error("provider never saw completed deal") t.FailNow() case providerDealState = <-providerDealStateChan: diff --git a/storagemarket/impl/requestvalidation/common.go b/storagemarket/impl/requestvalidation/common.go index 41a41aa5..cc5f010c 100644 --- a/storagemarket/impl/requestvalidation/common.go +++ b/storagemarket/impl/requestvalidation/common.go @@ -15,7 +15,6 @@ import ( // Will succeed only if: // - voucher has correct type // - voucher references an active deal -// - referenced deal matches the client // - referenced deal matches the given base CID // - referenced deal is in an acceptable state func ValidatePush( @@ -34,9 +33,6 @@ func ValidatePush( if err != nil { return xerrors.Errorf("Proposal CID %s: %w", dealVoucher.Proposal.String(), ErrNoDeal) } - if deal.Client != sender { - return xerrors.Errorf("Deal Peer %s, Data Transfer Peer %s: %w", deal.Client.String(), sender.String(), ErrWrongPeer) - } if !deal.Ref.Root.Equals(baseCid) { return xerrors.Errorf("Deal Payload CID %s, Data Transfer CID %s: %w", deal.Proposal.PieceCID.String(), baseCid.String(), ErrWrongPiece) @@ -53,7 +49,6 @@ func ValidatePush( // Will succeed only if: // - voucher has correct type // - voucher references an active deal -// - referenced deal matches the receiver (miner) // - referenced deal matches the given base CID // - referenced deal is in an acceptable state func ValidatePull( @@ -71,9 +66,6 @@ func ValidatePull( return xerrors.Errorf("Proposal CID %s: %w", dealVoucher.Proposal.String(), ErrNoDeal) } - if deal.Miner != receiver { - return xerrors.Errorf("Deal Peer %s, Data Transfer Peer %s: %w", deal.Miner.String(), receiver.String(), ErrWrongPeer) - } if !deal.DataRef.Root.Equals(baseCid) { return xerrors.Errorf("Deal Payload CID %s, Data Transfer CID %s: %w", deal.Proposal.PieceCID.String(), baseCid.String(), ErrWrongPiece) } diff --git a/storagemarket/impl/requestvalidation/request_validation_test.go b/storagemarket/impl/requestvalidation/request_validation_test.go index 85428f89..3de91720 100644 --- a/storagemarket/impl/requestvalidation/request_validation_test.go +++ b/storagemarket/impl/requestvalidation/request_validation_test.go @@ -176,21 +176,6 @@ func AssertPushValidator(t *testing.T, validator datatransfer.RequestValidator, t.Fatal("Push should fail if there is no deal stored") } }) - t.Run("ValidatePush fails wrong miner", func(t *testing.T) { - otherClient := peer.ID("otherclient") - minerDeal, err := newMinerDeal(otherClient, storagemarket.StorageDealProposalAccepted) - if err != nil { - t.Fatal("error creating client deal") - } - if err := state.Begin(minerDeal.ProposalCid, &minerDeal); err != nil { - t.Fatal("deal tracking failed") - } - ref := minerDeal.Ref - _, err = validator.ValidatePush(false, datatransfer.ChannelID{}, sender, &rv.StorageDataTransferVoucher{minerDeal.ProposalCid}, ref.Root, nil) - if !xerrors.Is(err, rv.ErrWrongPeer) { - t.Fatal("Push should fail if miner address is incorrect") - } - }) t.Run("ValidatePush fails wrong piece ref", func(t *testing.T) { minerDeal, err := newMinerDeal(sender, storagemarket.StorageDealProposalAccepted) if err != nil { @@ -249,21 +234,6 @@ func AssertValidatesPulls(t *testing.T, validator datatransfer.RequestValidator, t.Fatal("Pull should fail if there is no deal stored") } }) - t.Run("ValidatePull fails wrong client", func(t *testing.T) { - otherMiner := peer.ID("otherminer") - clientDeal, err := newClientDeal(otherMiner, storagemarket.StorageDealProposalAccepted) - if err != nil { - t.Fatal("error creating client deal") - } - if err := state.Begin(clientDeal.ProposalCid, &clientDeal); err != nil { - t.Fatal("deal tracking failed") - } - payloadCid := clientDeal.DataRef.Root - _, err = validator.ValidatePull(false, datatransfer.ChannelID{}, receiver, &rv.StorageDataTransferVoucher{clientDeal.ProposalCid}, payloadCid, nil) - if !xerrors.Is(err, rv.ErrWrongPeer) { - t.Fatal("Pull should fail if miner address is incorrect") - } - }) t.Run("ValidatePull fails wrong piece ref", func(t *testing.T) { clientDeal, err := newClientDeal(receiver, storagemarket.StorageDealProposalAccepted) if err != nil {