fixup! feat(ipld): vouchers as plain ipld.Node

Author: rvagg

impl/integration_test.go

@@ -1177,11 +1177,12 @@ func TestRoundTripCancelledRequest(t *testing.T) {
 
 type retrievalRevalidator struct {
 	*testutil.StubbedValidator
-	providerPausePoint   int
-	pausePoints          []uint64
-	leavePausedInitially bool
-	initialVoucherResult ipld.Node
-	requiresFinalization bool
+	providerPausePoint       int
+	pausePoints              []uint64
+	leavePausedInitially     bool
+	initialVoucherResult     ipld.Node
+	initialVoucherResultType datatransfer.TypeIdentifier
+	requiresFinalization     bool
 }
 
 func (r *retrievalRevalidator) ValidatePush(
@@ -1195,6 +1196,7 @@ func (r *retrievalRevalidator) ValidatePush(
 		RequiresFinalization: r.requiresFinalization,
 		ForcePause:           r.leavePausedInitially,
 		VoucherResult:        r.initialVoucherResult,
+		VoucherResultType:    r.initialVoucherResultType,
 	}
 	if len(r.pausePoints) > r.providerPausePoint {
 		vr.DataLimit = r.pausePoints[r.providerPausePoint]
@@ -1215,6 +1217,7 @@ func (r *retrievalRevalidator) ValidatePull(
 		RequiresFinalization: r.requiresFinalization,
 		ForcePause:           r.leavePausedInitially,
 		VoucherResult:        r.initialVoucherResult,
+		VoucherResultType:    r.initialVoucherResultType,
 	}
 	if len(r.pausePoints) > r.providerPausePoint {
 		vr.DataLimit = r.pausePoints[r.providerPausePoint]
@@ -2031,6 +2034,7 @@ func TestMultipleMessagesInExtension(t *testing.T) {
 	// The first one is sent as a response from the initial request telling the client
 	// the provider has accepted the request and is starting to send blocks
 	respVoucher := testutil.NewTestVoucher()
+	respVoucherType := testutil.TestVoucherType
 	require.NoError(t, err)
 
 	// voucher results are sent by the providers to request payment while pausing until a voucher is sent
@@ -2089,10 +2093,11 @@ func TestMultipleMessagesInExtension(t *testing.T) {
 	providerFinished := make(chan struct{}, 1)
 	nextVoucherResult := 0
 	sv := &retrievalRevalidator{
-		StubbedValidator:     testutil.NewStubbedValidator(),
-		pausePoints:          pausePoints,
-		requiresFinalization: true,
-		initialVoucherResult: respVoucher,
+		StubbedValidator:         testutil.NewStubbedValidator(),
+		pausePoints:              pausePoints,
+		requiresFinalization:     true,
+		initialVoucherResult:     respVoucher,
+		initialVoucherResultType: respVoucherType,
 	}
 	dt1.SubscribeToEvents(func(event datatransfer.Event, channelState datatransfer.ChannelState) {
 		if event.Code == datatransfer.Error {
@@ -2169,15 +2174,17 @@ func TestMultipleParallelTransfers(t *testing.T) {
 	// The first one is sent as a response from the initial request telling the client
 	// the provider has accepted the request and is starting to send blocks
 	respVoucher := testutil.NewTestVoucher()
+	respVoucherType := testutil.TestVoucherType
 	require.NoError(t, err)
 
 	// The final voucher result is sent by the provider to let the client know the deal is completed
 	finalVoucherResult := testutil.NewTestVoucher()
 	require.NoError(t, err)
 
 	sv := &retrievalRevalidator{
-		StubbedValidator:     testutil.NewStubbedValidator(),
-		initialVoucherResult: respVoucher,
+		StubbedValidator:         testutil.NewStubbedValidator(),
+		initialVoucherResult:     respVoucher,
+		initialVoucherResultType: respVoucherType,
 	}
 	require.NoError(t, dt1.RegisterVoucherType(testutil.TestVoucherType, sv))
 

impl/responding_test.go

@@ -40,7 +40,7 @@ func TestDataTransferResponding(t *testing.T) {
 			},
 			configureValidator: func(sv *testutil.StubbedValidator) {
 				sv.ExpectSuccessPush()
-				sv.StubResult(datatransfer.ValidationResult{Accepted: true, VoucherResult: testutil.NewTestVoucher()})
+				sv.StubResult(datatransfer.ValidationResult{Accepted: true, VoucherResult: testutil.NewTestVoucher(), VoucherResultType: testutil.TestVoucherType})
 			},
 			verify: func(t *testing.T, h *receiverHarness) {
 				h.network.Delegate.ReceiveRequest(h.ctx, h.peers[1], h.pushRequest)
@@ -73,7 +73,7 @@ func TestDataTransferResponding(t *testing.T) {
 		"new push request rejects": {
 			configureValidator: func(sv *testutil.StubbedValidator) {
 				sv.ExpectSuccessPush()
-				sv.StubResult(datatransfer.ValidationResult{Accepted: false, VoucherResult: testutil.NewTestVoucher()})
+				sv.StubResult(datatransfer.ValidationResult{Accepted: false, VoucherResult: testutil.NewTestVoucher(), VoucherResultType: testutil.TestVoucherType})
 			},
 			verify: func(t *testing.T, h *receiverHarness) {
 				h.network.Delegate.ReceiveRequest(h.ctx, h.peers[1], h.pushRequest)
@@ -94,7 +94,7 @@ func TestDataTransferResponding(t *testing.T) {
 		"new push request errors": {
 			configureValidator: func(sv *testutil.StubbedValidator) {
 				sv.ExpectErrorPush()
-				sv.StubResult(datatransfer.ValidationResult{VoucherResult: testutil.NewTestVoucher()})
+				sv.StubResult(datatransfer.ValidationResult{VoucherResult: testutil.NewTestVoucher(), VoucherResultType: testutil.TestVoucherType})
 			},
 			verify: func(t *testing.T, h *receiverHarness) {
 				h.network.Delegate.ReceiveRequest(h.ctx, h.peers[1], h.pushRequest)
@@ -115,7 +115,7 @@ func TestDataTransferResponding(t *testing.T) {
 		"new push request pauses": {
 			configureValidator: func(sv *testutil.StubbedValidator) {
 				sv.ExpectSuccessPush()
-				sv.StubResult(datatransfer.ValidationResult{Accepted: true, ForcePause: true, VoucherResult: testutil.NewTestVoucher()})
+				sv.StubResult(datatransfer.ValidationResult{Accepted: true, ForcePause: true, VoucherResult: testutil.NewTestVoucher(), VoucherResultType: testutil.TestVoucherType})
 			},
 			verify: func(t *testing.T, h *receiverHarness) {
 				h.network.Delegate.ReceiveRequest(h.ctx, h.peers[1], h.pushRequest)
@@ -277,7 +277,7 @@ func TestDataTransferResponding(t *testing.T) {
 			},
 			configureValidator: func(sv *testutil.StubbedValidator) {
 				sv.ExpectSuccessPush()
-				sv.StubResult(datatransfer.ValidationResult{Accepted: true, VoucherResult: testutil.NewTestVoucher()})
+				sv.StubResult(datatransfer.ValidationResult{Accepted: true, VoucherResult: testutil.NewTestVoucher(), VoucherResultType: testutil.TestVoucherType})
 			},
 			verify: func(t *testing.T, h *receiverHarness) {
 				h.network.Delegate.ReceiveRequest(h.ctx, h.peers[1], h.pushRequest)
@@ -294,7 +294,7 @@ func TestDataTransferResponding(t *testing.T) {
 				datatransfer.ResumeInitiator},
 			configureValidator: func(sv *testutil.StubbedValidator) {
 				sv.ExpectSuccessPush()
-				sv.StubResult(datatransfer.ValidationResult{Accepted: true, VoucherResult: testutil.NewTestVoucher()})
+				sv.StubResult(datatransfer.ValidationResult{Accepted: true, VoucherResult: testutil.NewTestVoucher(), VoucherResultType: testutil.TestVoucherType})
 			},
 			verify: func(t *testing.T, h *receiverHarness) {
 				h.network.Delegate.ReceiveRequest(h.ctx, h.peers[1], h.pushRequest)
@@ -314,7 +314,7 @@ func TestDataTransferResponding(t *testing.T) {
 				datatransfer.ResumeInitiator},
 			configureValidator: func(sv *testutil.StubbedValidator) {
 				sv.ExpectSuccessPush()
-				sv.StubResult(datatransfer.ValidationResult{Accepted: true, VoucherResult: testutil.NewTestVoucher()})
+				sv.StubResult(datatransfer.ValidationResult{Accepted: true, VoucherResult: testutil.NewTestVoucher(), VoucherResultType: testutil.TestVoucherType})
 			},
 			verify: func(t *testing.T, h *receiverHarness) {
 				h.network.Delegate.ReceiveRequest(h.ctx, h.peers[1], h.pushRequest)
@@ -336,7 +336,7 @@ func TestDataTransferResponding(t *testing.T) {
 			},
 			configureValidator: func(sv *testutil.StubbedValidator) {
 				sv.ExpectSuccessPush()
-				sv.StubResult(datatransfer.ValidationResult{Accepted: true, VoucherResult: testutil.NewTestVoucher()})
+				sv.StubResult(datatransfer.ValidationResult{Accepted: true, VoucherResult: testutil.NewTestVoucher(), VoucherResultType: testutil.TestVoucherType})
 			},
 			verify: func(t *testing.T, h *receiverHarness) {
 				h.network.Delegate.ReceiveRequest(h.ctx, h.peers[1], h.pushRequest)
@@ -362,7 +362,7 @@ func TestDataTransferResponding(t *testing.T) {
 			},
 			configureValidator: func(sv *testutil.StubbedValidator) {
 				sv.ExpectSuccessPush()
-				sv.StubResult(datatransfer.ValidationResult{Accepted: true, DataLimit: 1000, VoucherResult: testutil.NewTestVoucher()})
+				sv.StubResult(datatransfer.ValidationResult{Accepted: true, DataLimit: 1000, VoucherResult: testutil.NewTestVoucher(), VoucherResultType: testutil.TestVoucherType})
 			},
 			verify: func(t *testing.T, h *receiverHarness) {
 				h.network.Delegate.ReceiveRequest(h.ctx, h.peers[1], h.pushRequest)
@@ -379,7 +379,7 @@ func TestDataTransferResponding(t *testing.T) {
 				response, err = h.transport.EventHandler.OnRequestReceived(channelID(h.id, h.peers), h.voucherUpdate)
 				require.NoError(t, err, nil)
 				require.Nil(t, response)
-				err = h.dt.UpdateValidationStatus(ctx, channelID(h.id, h.peers), datatransfer.ValidationResult{Accepted: true, DataLimit: 50000, VoucherResult: testutil.NewTestVoucher()})
+				err = h.dt.UpdateValidationStatus(ctx, channelID(h.id, h.peers), datatransfer.ValidationResult{Accepted: true, DataLimit: 50000, VoucherResult: testutil.NewTestVoucher(), VoucherResultType: testutil.TestVoucherType})
 				require.NoError(t, err)
 				require.Len(t, h.transport.ResumedChannels, 1)
 				resCh := h.transport.ResumedChannels[0]
@@ -411,7 +411,7 @@ func TestDataTransferResponding(t *testing.T) {
 			},
 			configureValidator: func(sv *testutil.StubbedValidator) {
 				sv.ExpectSuccessPush()
-				sv.StubResult(datatransfer.ValidationResult{Accepted: true, DataLimit: 1000, VoucherResult: testutil.NewTestVoucher()})
+				sv.StubResult(datatransfer.ValidationResult{Accepted: true, DataLimit: 1000, VoucherResult: testutil.NewTestVoucher(), VoucherResultType: testutil.TestVoucherType})
 			},
 			verify: func(t *testing.T, h *receiverHarness) {
 				h.network.Delegate.ReceiveRequest(h.ctx, h.peers[1], h.pushRequest)
@@ -428,7 +428,7 @@ func TestDataTransferResponding(t *testing.T) {
 				response, err = h.transport.EventHandler.OnRequestReceived(channelID(h.id, h.peers), h.voucherUpdate)
 				require.NoError(t, err, nil)
 				require.Nil(t, response)
-				err = h.dt.UpdateValidationStatus(ctx, channelID(h.id, h.peers), datatransfer.ValidationResult{Accepted: false, VoucherResult: testutil.NewTestVoucher()})
+				err = h.dt.UpdateValidationStatus(ctx, channelID(h.id, h.peers), datatransfer.ValidationResult{Accepted: false, VoucherResult: testutil.NewTestVoucher(), VoucherResultType: testutil.TestVoucherType})
 				require.NoError(t, err)
 				require.Len(t, h.transport.ClosedChannels, 1)
 				require.Equal(t, h.transport.ClosedChannels[0], channelID(h.id, h.peers))
@@ -461,7 +461,7 @@ func TestDataTransferResponding(t *testing.T) {
 			},
 			configureValidator: func(sv *testutil.StubbedValidator) {
 				sv.ExpectSuccessPull()
-				sv.StubResult(datatransfer.ValidationResult{Accepted: true, DataLimit: 1000, VoucherResult: testutil.NewTestVoucher()})
+				sv.StubResult(datatransfer.ValidationResult{Accepted: true, DataLimit: 1000, VoucherResult: testutil.NewTestVoucher(), VoucherResultType: testutil.TestVoucherType})
 			},
 			verify: func(t *testing.T, h *receiverHarness) {
 				_, err := h.transport.EventHandler.OnRequestReceived(channelID(h.id, h.peers), h.pullRequest)
@@ -481,7 +481,7 @@ func TestDataTransferResponding(t *testing.T) {
 				response, err = h.transport.EventHandler.OnRequestReceived(channelID(h.id, h.peers), h.voucherUpdate)
 				require.NoError(t, err, nil)
 				require.Nil(t, response)
-				err = h.dt.UpdateValidationStatus(ctx, channelID(h.id, h.peers), datatransfer.ValidationResult{Accepted: true, DataLimit: 50000, VoucherResult: testutil.NewTestVoucher()})
+				err = h.dt.UpdateValidationStatus(ctx, channelID(h.id, h.peers), datatransfer.ValidationResult{Accepted: true, DataLimit: 50000, VoucherResult: testutil.NewTestVoucher(), VoucherResultType: testutil.TestVoucherType})
 				require.NoError(t, err)
 				require.Len(t, h.transport.ResumedChannels, 1)
 				resCh := h.transport.ResumedChannels[0]
@@ -512,7 +512,7 @@ func TestDataTransferResponding(t *testing.T) {
 			},
 			configureValidator: func(sv *testutil.StubbedValidator) {
 				sv.ExpectSuccessPull()
-				sv.StubResult(datatransfer.ValidationResult{Accepted: true, RequiresFinalization: true, VoucherResult: testutil.NewTestVoucher()})
+				sv.StubResult(datatransfer.ValidationResult{Accepted: true, RequiresFinalization: true, VoucherResult: testutil.NewTestVoucher(), VoucherResultType: testutil.TestVoucherType})
 			},
 			verify: func(t *testing.T, h *receiverHarness) {
 				_, err := h.transport.EventHandler.OnRequestReceived(channelID(h.id, h.peers), h.pullRequest)
@@ -533,7 +533,7 @@ func TestDataTransferResponding(t *testing.T) {
 				response, err = h.transport.EventHandler.OnRequestReceived(channelID(h.id, h.peers), h.voucherUpdate)
 				require.NoError(t, err, nil)
 				require.Nil(t, response)
-				err = h.dt.UpdateValidationStatus(ctx, channelID(h.id, h.peers), datatransfer.ValidationResult{Accepted: true, VoucherResult: testutil.NewTestVoucher()})
+				err = h.dt.UpdateValidationStatus(ctx, channelID(h.id, h.peers), datatransfer.ValidationResult{Accepted: true, VoucherResult: testutil.NewTestVoucher(), VoucherResultType: testutil.TestVoucherType})
 				require.NoError(t, err)
 				require.Len(t, h.network.SentMessages, 2)
 				sentMsg := h.network.SentMessages[1]
@@ -698,9 +698,9 @@ func TestDataTransferRestartResponding(t *testing.T) {
 			},
 			configureValidator: func(sv *testutil.StubbedValidator) {
 				sv.ExpectSuccessPush()
-				sv.StubResult(datatransfer.ValidationResult{Accepted: true, VoucherResult: testutil.NewTestVoucher()})
+				sv.StubResult(datatransfer.ValidationResult{Accepted: true, VoucherResult: testutil.NewTestVoucher(), VoucherResultType: testutil.TestVoucherType})
 				sv.ExpectSuccessValidateRestart()
-				sv.StubRestartResult(datatransfer.ValidationResult{Accepted: true, VoucherResult: testutil.NewTestVoucher()})
+				sv.StubRestartResult(datatransfer.ValidationResult{Accepted: true, VoucherResult: testutil.NewTestVoucher(), VoucherResultType: testutil.TestVoucherType})
 			},
 			verify: func(t *testing.T, h *receiverHarness) {
 				// receive an incoming push
@@ -759,9 +759,9 @@ func TestDataTransferRestartResponding(t *testing.T) {
 			},
 			configureValidator: func(sv *testutil.StubbedValidator) {
 				sv.ExpectSuccessPull()
-				sv.StubResult(datatransfer.ValidationResult{Accepted: true, VoucherResult: testutil.NewTestVoucher()})
+				sv.StubResult(datatransfer.ValidationResult{Accepted: true, VoucherResult: testutil.NewTestVoucher(), VoucherResultType: testutil.TestVoucherType})
 				sv.ExpectSuccessValidateRestart()
-				sv.StubRestartResult(datatransfer.ValidationResult{Accepted: true, VoucherResult: testutil.NewTestVoucher()})
+				sv.StubRestartResult(datatransfer.ValidationResult{Accepted: true, VoucherResult: testutil.NewTestVoucher(), VoucherResultType: testutil.TestVoucherType})
 			},
 			verify: func(t *testing.T, h *receiverHarness) {
 				// receive an incoming pull
@@ -802,7 +802,7 @@ func TestDataTransferRestartResponding(t *testing.T) {
 			},
 			configureValidator: func(sv *testutil.StubbedValidator) {
 				sv.ExpectSuccessPull()
-				sv.StubResult(datatransfer.ValidationResult{Accepted: true, VoucherResult: testutil.NewTestVoucher()})
+				sv.StubResult(datatransfer.ValidationResult{Accepted: true, VoucherResult: testutil.NewTestVoucher(), VoucherResultType: testutil.TestVoucherType})
 			},
 			verify: func(t *testing.T, h *receiverHarness) {
 				// receive an incoming pull
@@ -831,7 +831,7 @@ func TestDataTransferRestartResponding(t *testing.T) {
 			},
 			configureValidator: func(sv *testutil.StubbedValidator) {
 				sv.ExpectSuccessPull()
-				sv.StubResult(datatransfer.ValidationResult{Accepted: true, VoucherResult: testutil.NewTestVoucher()})
+				sv.StubResult(datatransfer.ValidationResult{Accepted: true, VoucherResult: testutil.NewTestVoucher(), VoucherResultType: testutil.TestVoucherType})
 				sv.ExpectSuccessValidateRestart()
 				sv.StubRestartResult(datatransfer.ValidationResult{Accepted: false})
 			},
@@ -859,7 +859,7 @@ func TestDataTransferRestartResponding(t *testing.T) {
 			},
 			configureValidator: func(sv *testutil.StubbedValidator) {
 				sv.ExpectSuccessPull()
-				sv.StubResult(datatransfer.ValidationResult{Accepted: true, VoucherResult: testutil.NewTestVoucher()})
+				sv.StubResult(datatransfer.ValidationResult{Accepted: true, VoucherResult: testutil.NewTestVoucher(), VoucherResultType: testutil.TestVoucherType})
 			},
 			verify: func(t *testing.T, h *receiverHarness) {
 				// receive an incoming pull
@@ -886,7 +886,7 @@ func TestDataTransferRestartResponding(t *testing.T) {
 			},
 			configureValidator: func(sv *testutil.StubbedValidator) {
 				sv.ExpectSuccessPull()
-				sv.StubResult(datatransfer.ValidationResult{Accepted: true, VoucherResult: testutil.NewTestVoucher()})
+				sv.StubResult(datatransfer.ValidationResult{Accepted: true, VoucherResult: testutil.NewTestVoucher(), VoucherResultType: testutil.TestVoucherType})
 			},
 			verify: func(t *testing.T, h *receiverHarness) {
 				// receive an incoming pull
@@ -913,7 +913,7 @@ func TestDataTransferRestartResponding(t *testing.T) {
 			},
 			configureValidator: func(sv *testutil.StubbedValidator) {
 				sv.ExpectSuccessPull()
-				sv.StubResult(datatransfer.ValidationResult{Accepted: true, VoucherResult: testutil.NewTestVoucher()})
+				sv.StubResult(datatransfer.ValidationResult{Accepted: true, VoucherResult: testutil.NewTestVoucher(), VoucherResultType: testutil.TestVoucherType})
 			},
 			verify: func(t *testing.T, h *receiverHarness) {
 				// receive an incoming pull

message/message1_1prime/transfer_message.go

@@ -46,7 +46,7 @@ func (tm *TransferMessage1_1) ToIPLD() (ipld.Node, error) {
 	if err != nil {
 		return nil, err
 	}
-	return node.(schema.TypedNode).Representation(), nil
+	return node.Representation(), nil
 }
 
 // ToNet serializes a transfer message type.

network/libp2p_impl_test.go

@@ -132,7 +132,8 @@ func TestMessageSendAndReceive(t *testing.T) {
 		accepted := false
 		id := datatransfer.TransferID(rand.Int31())
 		voucherResult := testutil.NewTestVoucher()
-		response, err := message.ValidationResultResponse(types.NewMessage, id, datatransfer.ValidationResult{Accepted: accepted, VoucherResult: voucherResult}, nil, false)
+		voucherResultType := testutil.TestVoucherType
+		response, err := message.ValidationResultResponse(types.NewMessage, id, datatransfer.ValidationResult{Accepted: accepted, VoucherResult: voucherResult, VoucherResultType: voucherResultType}, nil, false)
 		require.NoError(t, err)
 		require.NoError(t, dtnet2.SendMessage(ctx, host1.ID(), response))