[#1839] Fix dispute_resolution conversion to handle missing payouts

Author: placer14

repo/dispute_resolution.go

@@ -10,16 +10,25 @@ import (
 // turns them into their v5 counterpart.
 func ToV5DisputeResolution(disputeResolution *pb.DisputeResolution) *pb.DisputeResolution {
 	newDisputeResolution := proto.Clone(disputeResolution).(*pb.DisputeResolution)
+	if disputeResolution.Payout == nil {
+		return newDisputeResolution
+	}
 
-	if disputeResolution.Payout.BuyerOutput.Amount != 0 && disputeResolution.Payout.BuyerOutput.BigAmount == "" {
+	if disputeResolution.Payout.BuyerOutput != nil &&
+		disputeResolution.Payout.BuyerOutput.Amount != 0 &&
+		disputeResolution.Payout.BuyerOutput.BigAmount == "" {
 		newDisputeResolution.Payout.BuyerOutput.BigAmount = big.NewInt(int64(disputeResolution.Payout.BuyerOutput.Amount)).String()
 		newDisputeResolution.Payout.BuyerOutput.Amount = 0
 	}
-	if disputeResolution.Payout.VendorOutput.Amount != 0 && disputeResolution.Payout.VendorOutput.BigAmount == "" {
+	if disputeResolution.Payout.VendorOutput != nil &&
+		disputeResolution.Payout.VendorOutput.Amount != 0 &&
+		disputeResolution.Payout.VendorOutput.BigAmount == "" {
 		newDisputeResolution.Payout.VendorOutput.BigAmount = big.NewInt(int64(disputeResolution.Payout.VendorOutput.Amount)).String()
 		newDisputeResolution.Payout.VendorOutput.Amount = 0
 	}
-	if disputeResolution.Payout.ModeratorOutput.Amount != 0 && disputeResolution.Payout.ModeratorOutput.BigAmount == "" {
+	if disputeResolution.Payout.ModeratorOutput != nil &&
+		disputeResolution.Payout.ModeratorOutput.Amount != 0 &&
+		disputeResolution.Payout.ModeratorOutput.BigAmount == "" {
 		newDisputeResolution.Payout.ModeratorOutput.BigAmount = big.NewInt(int64(disputeResolution.Payout.ModeratorOutput.Amount)).String()
 		newDisputeResolution.Payout.ModeratorOutput.Amount = 0
 	}

repo/dispute_resolution_test.go

@@ -1,8 +1,10 @@
-package repo
+package repo_test
 
 import (
-	"github.com/OpenBazaar/openbazaar-go/pb"
 	"testing"
+
+	"github.com/OpenBazaar/openbazaar-go/pb"
+	"github.com/OpenBazaar/openbazaar-go/repo"
 )
 
 func TestToV5DisputeResolution(t *testing.T) {
@@ -20,7 +22,7 @@ func TestToV5DisputeResolution(t *testing.T) {
 				},
 			},
 		}
-		newDisputeResolution = ToV5DisputeResolution(disputeResolution)
+		newDisputeResolution = repo.ToV5DisputeResolution(disputeResolution)
 		expected             = "10000"
 	)
 
@@ -44,3 +46,52 @@ func TestToV5DisputeResolution(t *testing.T) {
 		t.Errorf("Expected Amount of 0, got %d", newDisputeResolution.Payout.ModeratorOutput.Amount)
 	}
 }
+
+func TestToV5DisputeResolutionHandlesMissingOutputs(t *testing.T) {
+	var (
+		examples = []*pb.DisputeResolution{
+			{ // missing BuyerOutput
+				Payout: &pb.DisputeResolution_Payout{
+					BuyerOutput: nil,
+					VendorOutput: &pb.DisputeResolution_Payout_Output{
+						Amount: 10000,
+					},
+					ModeratorOutput: &pb.DisputeResolution_Payout_Output{
+						Amount: 10000,
+					},
+				},
+			},
+			{ // missing VendorOutput
+				Payout: &pb.DisputeResolution_Payout{
+					BuyerOutput: &pb.DisputeResolution_Payout_Output{
+						Amount: 10000,
+					},
+					VendorOutput: nil,
+					ModeratorOutput: &pb.DisputeResolution_Payout_Output{
+						Amount: 10000,
+					},
+				},
+			},
+			{ // missing ModeratorOutput
+				Payout: &pb.DisputeResolution_Payout{
+					BuyerOutput: &pb.DisputeResolution_Payout_Output{
+						Amount: 10000,
+					},
+					VendorOutput: &pb.DisputeResolution_Payout_Output{
+						Amount: 10000,
+					},
+					ModeratorOutput: nil,
+				},
+			},
+		}
+	)
+
+	for _, e := range examples {
+		repo.ToV5DisputeResolution(e)
+	}
+}
+
+func TestToV5DisputeResolutionHandlesMissingPayout(t *testing.T) {
+	var example = &pb.DisputeResolution{Payout: nil}
+	repo.ToV5DisputeResolution(example)
+}