Fix bug creating v4 moderated order

Author: cpacia

core/order.go

@@ -217,14 +217,6 @@ func prepareModeratedOrderContract(data *repo.PurchaseData, n *OpenBazaarNode, c
 	payment := new(pb.Order_Payment)
 	payment.Method = pb.Order_Payment_MODERATED
 	payment.Moderator = data.Moderator
-	defn, err := n.LookupCurrency(data.PaymentCoin)
-	if err != nil {
-		return nil, errors.New("invalid payment coin")
-	}
-	payment.AmountCurrency = &pb.CurrencyDefinition{
-		Code:         defn.Code.String(),
-		Divisibility: uint32(defn.Divisibility),
-	}
 
 	profile, err := n.FetchProfile(data.Moderator, true)
 	if err != nil {
@@ -242,11 +234,19 @@ func prepareModeratedOrderContract(data *repo.PurchaseData, n *OpenBazaarNode, c
 		return nil, errors.New("moderator does not accept our currency")
 	}
 	contract.BuyerOrder.Payment = payment
+	defn, err := n.LookupCurrency(data.PaymentCoin)
+	if err != nil {
+		return nil, errors.New("invalid payment coin")
+	}
 	if contract.VendorListings[0].Metadata.Version >= repo.ListingVersion {
 		payment.AmountCurrency = &pb.CurrencyDefinition{
 			Code:         defn.Code.String(),
 			Divisibility: uint32(defn.Divisibility),
 		}
+		payment.AmountCurrency = &pb.CurrencyDefinition{
+			Code:         defn.Code.String(),
+			Divisibility: uint32(defn.Divisibility),
+		}
 	} else {
 		payment.Coin = defn.Code.String()
 	}
@@ -307,7 +307,11 @@ func prepareModeratedOrderContract(data *repo.PurchaseData, n *OpenBazaarNode, c
 	payment.RedeemScript = hex.EncodeToString(redeemScript)
 	payment.Chaincode = hex.EncodeToString(chaincode)
 	fee := wal.GetFeePerByte(wallet.NORMAL)
-	contract.BuyerOrder.BigRefundFee = fee.String()
+	if contract.VendorListings[0].Metadata.Version >= repo.ListingVersion {
+		contract.BuyerOrder.BigRefundFee = fee.String()
+	} else {
+		contract.BuyerOrder.RefundFee = fee.Uint64()
+	}
 
 	err = wal.AddWatchedAddresses(addr)
 	if err != nil {

qa/purchase_crypto_listing.py

@@ -56,10 +56,7 @@ def run_test(self):
         if r.status_code != 200:
             raise TestFailure("PurchaseCryptoListingTest - FAIL: Inventory get endpoint failed")
 
-        check_amt = "350000000000000000"
-        if self.vendor_version == 4:
-            check_amt = 350000000000000000
-        if resp["ether"]["inventory"] != check_amt:
+        if int(resp["ether"]["inventory"]) != 350000000000000000:
             raise TestFailure("PurchaseCryptoListingTest - FAIL: Inventory incorrect: %d", resp["ether"]["inventory"])
 
         # get listing hash
@@ -89,7 +86,7 @@ def run_test(self):
         payment_address = resp["paymentAddress"]
         payment_amount = resp["amount"]
         amt = 0
-        if self.buyer_version == 4:
+        if self.buyer_version == "v4":
             amt = payment_amount
         else:
             amt = int(payment_amount["amount"])
@@ -136,7 +133,7 @@ def run_test(self):
             "feeLevel": "NORMAL",
             "requireAssociateOrder": False
         }
-        if self.buyer_version == 4:
+        if self.buyer_version == "v4":
             spend["amount"] = payment_amount
             spend["wallet"] = "T" + self.cointype
 
@@ -205,11 +202,12 @@ def run_test(self):
         if r.status_code != 200:
             raise TestFailure("PurchaseCryptoListingTest - FAIL: Inventory get endpoint failed")
 
-        check_amt = "340000000000000000"
-        if self.buyer_version == 4:
-            check_amt = 340000000000000000
-        if resp["ether"]["inventory"] != check_amt:
-            raise TestFailure("PurchaseCryptoListingTest - FAIL: Inventory incorrect: %d", resp["ether"]["inventory"])
+        if self.buyer_version == "v4":
+            if int(resp["ether"]["inventory"]) != 340000000000000000:
+                raise TestFailure("PurchaseCryptoListingTest - FAIL: Inventory incorrect: %d", resp["ether"]["inventory"])
+        if self.vendor_version == "v4":
+            if int(resp["ether"]["inventory"]) != 350000000:
+                raise TestFailure("PurchaseCryptoListingTest - FAIL: Inventory incorrect: %d", resp["ether"]["inventory"])
 
         print("PurchaseCryptoListingTest - PASS")
 

qa/purchase_digital.py

@@ -38,7 +38,7 @@ def run_test(self):
         # post listing to alice
         with open('testdata/'+ self.vendor_version +'/digital.json') as listing_file:
             listing_json = json.load(listing_file, object_pairs_hook=OrderedDict)
-        if self.vendor_version == 4:
+        if self.vendor_version == "v4":
             listing_json["metadata"]["priceCurrency"] = "t" + self.cointype
         else:
             listing_json["item"]["priceCurrency"]["code"] = "t" + self.cointype
@@ -108,7 +108,7 @@ def run_test(self):
             "feeLevel": "NORMAL",
             "requireAssociateOrder": False
         }
-        if self.buyer_version == 4:
+        if self.buyer_version == "v4":
             spend["amount"] = payment_amount
             spend["wallet"] = "T" + self.cointype
 

qa/purchase_moderated_online.py

@@ -63,7 +63,7 @@ def run_test(self):
         # post listing to alice
         with open('testdata/'+ self.vendor_version +'/listing.json') as listing_file:
             listing_json = json.load(listing_file, object_pairs_hook=OrderedDict)
-        if self.vendor_version == 4:
+        if self.vendor_version == "v4":
             listing_json["metadata"]["priceCurrency"] = "t" + self.cointype
         else:
             listing_json["item"]["priceCurrency"]["code"] = "t" + self.cointype
@@ -136,7 +136,7 @@ def run_test(self):
             "feeLevel": "NORMAL",
             "requireAssociateOrder": False
         }
-        if self.buyer_version == 4:
+        if self.buyer_version == "v4":
             spend["amount"] = payment_amount
             spend["wallet"] = "T" + self.cointype
 

repo/listing.go

@@ -919,7 +919,7 @@ func (cs ListingCoupons) GetProtobuf() []*pb.Listing_Coupon {
 	var cspb = make([]*pb.Listing_Coupon, len(cs))
 	for i, c := range cs {
 		cspb[i] = &pb.Listing_Coupon{
-			Title:           c.GetTitle(),
+			Title: c.GetTitle(),
 		}
 		if c.GetPercentOff() > 0 {
 			cspb[i].Discount = &pb.Listing_Coupon_PercentDiscount{