Skip to content

Support no-op error responses #186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 2, 2021
Merged

Support no-op error responses #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
886d168
support no-op err responses
aarshkshah1992 Apr 1, 2021
4e2150d
changes as oper review
aarshkshah1992 Apr 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
115 changes: 0 additions & 115 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 6 additions & 1 deletion impl/events.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,6 +442,11 @@ func (m *manager) processRevalidationResult(chid datatransfer.ChannelID, result
return nil, err
}
}

if resultErr == nil {
return vresMessage, nil
}

if resultErr == datatransfer.ErrPause {
err := m.pause(chid)
if err != nil {
Expand All @@ -450,7 +455,7 @@ func (m *manager) processRevalidationResult(chid datatransfer.ChannelID, result
return vresMessage, datatransfer.ErrPause
}

if resultErr == nil {
if resultErr == datatransfer.ErrResume {
err = m.resume(chid)
if err != nil {
return nil, err
Expand Down
2 changes: 1 addition & 1 deletion impl/integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1030,7 +1030,7 @@ func TestSimulatedRetrievalFlow(t *testing.T) {
srv := &retrievalRevalidator{
testutil.NewStubbedRevalidator(), 0, 0, config.pausePoints, finalVoucherResult,
}
srv.ExpectSuccessRevalidation()
srv.ExpectSuccessErrResume()
require.NoError(t, dt1.RegisterRevalidator(testutil.NewFakeDTType(), srv))

require.NoError(t, dt2.RegisterVoucherResultType(testutil.NewFakeDTType()))
Expand Down
10 changes: 7 additions & 3 deletions impl/responding_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,10 @@ func TestDataTransferResponding(t *testing.T) {
sv.ExpectSuccessPush()
sv.StubResult(testutil.NewFakeDTType())
},
configureRevalidator: func(sv *testutil.StubbedRevalidator) {
sv.ExpectSuccessErrResume()
},

verify: func(t *testing.T, h *receiverHarness) {
h.network.Delegate.ReceiveRequest(h.ctx, h.peers[1], h.pushRequest)
_, err := h.transport.EventHandler.OnRequestReceived(channelID(h.id, h.peers), h.voucherUpdate)
Expand Down Expand Up @@ -278,7 +282,7 @@ func TestDataTransferResponding(t *testing.T) {
configureRevalidator: func(srv *testutil.StubbedRevalidator) {
srv.ExpectPausePushCheck()
srv.StubRevalidationResult(testutil.NewFakeDTType())
srv.ExpectSuccessRevalidation()
srv.ExpectSuccessErrResume()
srv.StubCheckResult(testutil.NewFakeDTType())
},
verify: func(t *testing.T, h *receiverHarness) {
Expand Down Expand Up @@ -415,7 +419,7 @@ func TestDataTransferResponding(t *testing.T) {
configureRevalidator: func(srv *testutil.StubbedRevalidator) {
srv.ExpectPausePullCheck()
srv.StubRevalidationResult(testutil.NewFakeDTType())
srv.ExpectSuccessRevalidation()
srv.ExpectSuccessErrResume()
srv.StubCheckResult(testutil.NewFakeDTType())
},
verify: func(t *testing.T, h *receiverHarness) {
Expand Down Expand Up @@ -464,7 +468,7 @@ func TestDataTransferResponding(t *testing.T) {
configureRevalidator: func(srv *testutil.StubbedRevalidator) {
srv.ExpectPauseComplete()
srv.StubRevalidationResult(testutil.NewFakeDTType())
srv.ExpectSuccessRevalidation()
srv.ExpectSuccessErrResume()
},
verify: func(t *testing.T, h *receiverHarness) {
_, err := h.transport.EventHandler.OnRequestReceived(channelID(h.id, h.peers), h.pullRequest)
Expand Down
4 changes: 2 additions & 2 deletions impl/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func (m *manager) newRequest(ctx context.Context, selector ipld.Node, isPull boo
}

func (m *manager) response(isRestart bool, isNew bool, err error, tid datatransfer.TransferID, voucherResult datatransfer.VoucherResult) (datatransfer.Response, error) {
isAccepted := err == nil || err == datatransfer.ErrPause
isAccepted := err == nil || err == datatransfer.ErrPause || err == datatransfer.ErrResume
isPaused := err == datatransfer.ErrPause
resultType := datatransfer.EmptyTypeIdentifier
if voucherResult != nil {
Expand All @@ -55,7 +55,7 @@ func (m *manager) response(isRestart bool, isNew bool, err error, tid datatransf
}

func (m *manager) completeResponse(err error, tid datatransfer.TransferID, voucherResult datatransfer.VoucherResult) (datatransfer.Response, error) {
isAccepted := err == nil || err == datatransfer.ErrPause
isAccepted := err == nil || err == datatransfer.ErrPause || err == datatransfer.ErrResume
isPaused := err == datatransfer.ErrPause
resultType := datatransfer.EmptyTypeIdentifier
if voucherResult != nil {
Expand Down
7 changes: 7 additions & 0 deletions testutil/stubbedvalidator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,13 @@ func (srv *StubbedRevalidator) StubPauseRevalidation() {
srv.revalidationError = datatransfer.ErrPause
}

// ExpectSuccessErrResume configures Revalidate to return an ErrResume
// and expect a Revalidate call.
func (srv *StubbedRevalidator) ExpectSuccessErrResume() {
srv.expectRevalidate = true
srv.revalidationError = datatransfer.ErrResume
}

// ExpectErrorRevalidation expects Revalidate to error
func (srv *StubbedRevalidator) ExpectErrorRevalidation() {
srv.expectRevalidate = true
Expand Down