Fix conversion nits

Author: cpacia

core/confirmation.go

@@ -88,7 +88,7 @@ func (n *OpenBazaarNode) NewOrderConfirmation(contract *pb.RicardianContract, ad
 		oc.PaymentAddress = order.Payment.Address
 	}
 
-	oc.BigRequestedAmount = big.NewInt(int64(order.Payment.Amount)).String()
+	oc.BigRequestedAmount = order.Payment.BigAmount
 	contract.VendorOrderConfirmation = oc
 	contract, err = n.SignOrderConfirmation(contract)
 	if err != nil {

core/disputes.go

@@ -282,7 +282,7 @@ func (n *OpenBazaarNode) ProcessDisputeOpen(rc *pb.RicardianContract, peerID str
 	if len(contract.VendorListings) > 0 && contract.VendorListings[0].Item != nil && len(contract.VendorListings[0].Item.Images) > 0 {
 		thumbnailTiny = contract.VendorListings[0].Item.Images[0].Tiny
 		thumbnailSmall = contract.VendorListings[0].Item.Images[0].Small
-		if order != nil && order.BuyerID != nil {
+		if order.BuyerID != nil {
 			buyer = order.BuyerID.PeerID
 		}
 	}
@@ -643,7 +643,7 @@ func (n *OpenBazaarNode) CloseDispute(orderID string, buyerPercentage, vendorPer
 
 	// Calculate total fee
 	defaultFee := wal.GetFeePerByte(wallet.NORMAL)
-	txFee := wal.EstimateFee(inputs, outputs, dispute.ResolutionPaymentFeePerByte(payDivision, defaultFee))
+	txFee := wal.EstimateFee(inputs, outputs, *dispute.ResolutionPaymentFeePerByte(payDivision, defaultFee))
 
 	// Subtract fee from each output in proportion to output value
 	var outs []wallet.TransactionOutput
@@ -916,6 +916,7 @@ func (n *OpenBazaarNode) ValidateCaseContract(contract *pb.RicardianContract) []
 	if contract.BuyerOrder.Payment != nil {
 		order, err := repo.ToV5Order(contract.BuyerOrder, n.LookupCurrency)
 		if err != nil {
+			validationErrors = append(validationErrors, fmt.Sprintf("Error converting to v5 order: %s", err))
 			return validationErrors
 		}
 		wal, err := n.Multiwallet.WalletForCurrencyCode(order.Payment.AmountCurrency.Code)

core/utils.go

@@ -71,7 +71,7 @@ func (n *OpenBazaarNode) BuildTransactionRecords(contract *pb.RicardianContract,
 		paymentRecords = append(paymentRecords, rec)
 	}
 	var refundRecord *pb.TransactionRecord
-	if contract != nil && (state == pb.OrderState_REFUNDED || state == pb.OrderState_DECLINED || state == pb.OrderState_CANCELED) && order != nil && order.Payment != nil {
+	if contract != nil && (state == pb.OrderState_REFUNDED || state == pb.OrderState_DECLINED || state == pb.OrderState_CANCELED) && order.Payment != nil {
 		// For multisig we can use the outgoing from the payment address
 		if order.Payment.Method == pb.Order_Payment_MODERATED || state == pb.OrderState_DECLINED || state == pb.OrderState_CANCELED {
 			for _, rec := range payments {

net/service/handlers.go

@@ -1156,7 +1156,7 @@ func (service *OpenBazaarService) handleOrderCompletion(p peer.ID, pmes *pb.Mess
 	if len(contract.VendorListings) > 0 && contract.VendorListings[0].Item != nil && len(contract.VendorListings[0].Item.Images) > 0 {
 		thumbnailTiny = contract.VendorListings[0].Item.Images[0].Tiny
 		thumbnailSmall = contract.VendorListings[0].Item.Images[0].Small
-		if order != nil && order.BuyerID != nil {
+		if order.BuyerID != nil {
 			buyerID = order.BuyerID.PeerID
 			buyerHandle = order.BuyerID.Handle
 		}

repo/dispute_case_record.go

@@ -103,20 +103,20 @@ func (r *DisputeCaseRecord) Contract() *pb.RicardianContract {
 
 // ResolutionPaymentFeePerByte returns the preferred outpoints to be used when resolving
 // a pending DisputeCaseResolution based on the provided PayoutRatio
-func (r *DisputeCaseRecord) ResolutionPaymentFeePerByte(ratio PayoutRatio, defaultFee big.Int) big.Int {
+func (r *DisputeCaseRecord) ResolutionPaymentFeePerByte(ratio PayoutRatio, defaultFee big.Int) *big.Int {
 	n := new(big.Int)
 	switch {
 	case ratio.BuyerMajority(), ratio.EvenMajority():
 		n, _ = n.SetString(r.BuyerContract.BuyerOrder.BigRefundFee, 10)
-		return *n
+		return n
 	case ratio.VendorMajority():
 		if len(r.VendorContract.VendorOrderFulfillment) > 0 && r.VendorContract.VendorOrderFulfillment[0].Payout != nil {
 			fulfillment := ToV5OrderFulfillment(r.VendorContract.VendorOrderFulfillment[0])
 			n, _ = n.SetString(fulfillment.Payout.BigPayoutFeePerByte, 10)
-			return *n
+			return n
 		}
 	}
-	return *n
+	return n
 }
 
 // ResolutionPaymentOutpoints returns the preferred outpoints to be used when resolving