Update qa tests with v4 fixes

Author: cpacia

core/order.go

@@ -460,6 +460,10 @@ func processOfflineDirectOrder(n *OpenBazaarNode, wal wallet.Wallet, contract *p
 }
 
 func processOnlineModeratedOrder(resp *pb.Message, n *OpenBazaarNode, contract *pb.RicardianContract) (string, string, big.Int, bool, error) {
+	v5Order, err := repo.ToV5Order(contract.BuyerOrder, nil)
+	if err != nil {
+		return "", "", *big.NewInt(0), false, err
+	}
 	// Vendor responded
 	if resp.MessageType == pb.Message_ERROR {
 		return "", "", *big.NewInt(0), false, extractErrorMessage(resp)
@@ -468,7 +472,7 @@ func processOnlineModeratedOrder(resp *pb.Message, n *OpenBazaarNode, contract *
 		return "", "", *big.NewInt(0), false, errors.New("vendor responded to the order with an incorrect message type")
 	}
 	rc := new(pb.RicardianContract)
-	err := proto.Unmarshal(resp.Payload.Value, rc)
+	err = proto.Unmarshal(resp.Payload.Value, rc)
 	if err != nil {
 		return "", "", *big.NewInt(0), false, errors.New("error parsing the vendor's response")
 	}
@@ -493,14 +497,18 @@ func processOnlineModeratedOrder(resp *pb.Message, n *OpenBazaarNode, contract *
 	if err != nil {
 		return "", "", *big.NewInt(0), false, err
 	}
-	total, ok := new(big.Int).SetString(contract.BuyerOrder.Payment.BigAmount, 10)
+	total, ok := new(big.Int).SetString(v5Order.Payment.BigAmount, 10)
 	if !ok {
 		return "", "", *big.NewInt(0), false, errors.New("invalid payment amount")
 	}
 	return orderID, contract.VendorOrderConfirmation.PaymentAddress, *total, true, nil
 }
 
 func processOfflineModeratedOrder(n *OpenBazaarNode, contract *pb.RicardianContract) (string, string, big.Int, error) {
+	v5Order, err := repo.ToV5Order(contract.BuyerOrder, nil)
+	if err != nil {
+		return "", "", *big.NewInt(0), err
+	}
 	// Vendor offline
 	// Send using offline messaging
 	log.Warningf("Vendor %s is offline, sending offline order message", contract.VendorListings[0].VendorID.PeerID)
@@ -532,11 +540,11 @@ func processOfflineModeratedOrder(n *OpenBazaarNode, contract *pb.RicardianContr
 	if err != nil {
 		log.Error(err)
 	}
-	total, ok := new(big.Int).SetString(contract.BuyerOrder.Payment.BigAmount, 10)
+	total, ok := new(big.Int).SetString(v5Order.Payment.BigAmount, 10)
 	if !ok {
 		return "", "", *big.NewInt(0), errors.New("invalid payment amount")
 	}
-	return orderID, contract.BuyerOrder.Payment.Address, *total, err
+	return orderID, v5Order.Payment.Address, *total, err
 }
 
 func extractErrorMessage(m *pb.Message) error {

qa/complete_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
@@ -138,7 +138,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/listings.py

@@ -35,7 +35,7 @@ def run_test(self):
         # POST listing
         with open('testdata/'+ self.vendor_version +'/listing.json') as listing_file:
             ljson = json.load(listing_file, object_pairs_hook=OrderedDict)
-        if self.vendor_version == 4:
+        if self.vendor_version == "v4":
             ljson["metadata"]["priceCurrency"] = "t" + self.cointype
         else:
             ljson["item"]["priceCurrency"]["code"] = "t" + self.cointype

qa/reject_direct_offline.py

@@ -38,7 +38,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
@@ -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
 
@@ -149,10 +149,12 @@ def run_test(self):
         }
         r = requests.post(api_url, data=json.dumps(oc, indent=4))
         if r.status_code == 404:
+            print(r.text, r.status_code)
             raise TestFailure("RejectDirectOfflineTest - FAIL: Order confirmation post endpoint not found")
         elif r.status_code != 200:
             resp = json.loads(r.text)
             raise TestFailure("RejectDirectOfflineTest - FAIL: OrderConfirmation POST failed. Reason: %s", resp["reason"])
+
         time.sleep(20)
 
         # alice check order rejected correctly

qa/smtp_notification.py

@@ -79,10 +79,11 @@ 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
+        listing_json["metadata"]["acceptedCurrencies"] = ["t" + self.cointype]
 
         api_url = alice["gateway_url"] + "ob/listing"
         r = requests.post(api_url, data=json.dumps(listing_json, indent=4))
@@ -126,7 +127,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/upload_listing.py

@@ -16,11 +16,12 @@ def setup_network(self):
     def run_test(self):
         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
-        listing_json["item"]["priceCurrency"]["divisibility"] = 8
+            listing_json["item"]["priceCurrency"]["divisibility"] = 8
+        listing_json["metadata"]["acceptedCurrencies"] = ["t" + self.cointype]
         api_url = self.nodes[1]["gateway_url"] + "ob/listing"
         r = requests.post(api_url, data=json.dumps(listing_json, indent=4))
         if r.status_code == 404:
@@ -35,7 +36,7 @@ def run_test(self):
             inv = resp["ron-swanson-tshirt"]
             if inv == None:
                 raise TestFailure("UploadListingTest - FAIL: Did not return inventory for listing")
-            if inv["inventory"] != "213":
+            if int(inv["inventory"]) != 213:
                 raise TestFailure("UploadListingTest - FAIL: Returned incorrect amount of inventory: %d", inv["inventory"])
         elif r.status_code == 404:
             raise TestFailure("UploadListingTest - FAIL: Listing post endpoint not found")