Merge pull request #1775 from OpenBazaar/cryptoquantity

Fix bugs handling big inventory

Author: cpacia

api/jsonapi.go

@@ -1320,7 +1320,7 @@ func (i *jsonAPIHandler) POSTInventory(w http.ResponseWriter, r *http.Request) {
 	type inv struct {
 		Slug     string `json:"slug"`
 		Variant  int    `json:"variant"`
-		Quantity int64  `json:"quantity"`
+		Quantity string `json:"quantity"`
 	}
 	decoder := json.NewDecoder(r.Body)
 	var invList []inv
@@ -1330,7 +1330,12 @@ func (i *jsonAPIHandler) POSTInventory(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	for _, in := range invList {
-		err = i.node.Datastore.Inventory().Put(in.Slug, in.Variant, in.Quantity)
+		q, ok := new(big.Int).SetString(in.Quantity, 10)
+		if !ok {
+			ErrorResponse(w, http.StatusBadRequest, "error parsing quantity")
+			return
+		}
+		err = i.node.Datastore.Inventory().Put(in.Slug, in.Variant, q)
 		if err != nil {
 			ErrorResponse(w, http.StatusInternalServerError, err.Error())
 			return

api/jsonapi_data_test.go

@@ -289,7 +289,7 @@ const headerValidJSONResponse = `{
 const inventoryUpdateJSON = `[{
 	"slug": "ron_swanson_tshirt",
 	"variant": 0,
-	"quantity": 17
+	"quantity": "17"
 }]`
 
 //

core/errors.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
+	"math/big"
 	"strconv"
 
 	peer "gx/ipfs/QmYVXrKrKHDC9FobgmcmshCDyWwdrfwfanNQN4oxJ9Fk3h/go-libp2p-peer"
@@ -67,17 +68,17 @@ func (err CodedError) Error() string {
 // purchasing too many of an item
 type ErrOutOfInventory struct {
 	CodedError
-	RemainingInventory int64 `json:"remainingInventory"`
+	RemainingInventory string `json:"remainingInventory"`
 }
 
 // NewErrOutOfInventory - return out of inventory err with available inventory
-func NewErrOutOfInventory(inventoryRemaining int64) ErrOutOfInventory {
+func NewErrOutOfInventory(inventoryRemaining *big.Int) ErrOutOfInventory {
 	return ErrOutOfInventory{
 		CodedError: CodedError{
 			Reason: "not enough inventory",
 			Code:   "ERR_INSUFFICIENT_INVENTORY",
 		},
-		RemainingInventory: inventoryRemaining,
+		RemainingInventory: inventoryRemaining.String(),
 	}
 }
 

core/inventory.go

@@ -3,6 +3,7 @@ package core
 import (
 	"encoding/json"
 	"errors"
+	"math/big"
 
 	peer "gx/ipfs/QmYVXrKrKHDC9FobgmcmshCDyWwdrfwfanNQN4oxJ9Fk3h/go-libp2p-peer"
 	"time"
@@ -18,7 +19,7 @@ var (
 
 // InventoryListing is the listing representation stored on IPFS
 type InventoryListing struct {
-	Inventory   int64  `json:"inventory"`
+	Inventory   string `json:"inventory"`
 	LastUpdated string `json:"lastUpdated"`
 }
 
@@ -33,16 +34,18 @@ func (n *OpenBazaarNode) GetLocalInventory() (Inventory, error) {
 		return nil, err
 	}
 
-	inventory := make(Inventory, len(listings))
-	var totalCount int64
+	var (
+		totalCount *big.Int
+		inventory  = make(Inventory, len(listings))
+	)
 	for slug, variants := range listings {
-		totalCount = 0
+		totalCount = big.NewInt(0)
 		for _, variantCount := range variants {
-			totalCount += variantCount
+			totalCount = new(big.Int).Add(totalCount, variantCount)
 		}
 
 		inventory[slug] = &InventoryListing{
-			Inventory:   totalCount,
+			Inventory:   totalCount.String(),
 			LastUpdated: time.Now().UTC().Format(time.RFC3339),
 		}
 	}
@@ -58,13 +61,13 @@ func (n *OpenBazaarNode) GetLocalInventoryForSlug(slug string) (*InventoryListin
 	}
 
 	var inventory *InventoryListing
-	var totalCount int64
+	totalCount := big.NewInt(0)
 	for _, variantCount := range variants {
-		totalCount += variantCount
+		totalCount = new(big.Int).Add(totalCount, variantCount)
 	}
 
 	inventory = &InventoryListing{
-		Inventory:   totalCount,
+		Inventory:   totalCount.String(),
 		LastUpdated: time.Now().UTC().Format(time.RFC3339),
 	}
 

core/listings.go

@@ -84,7 +84,7 @@ func (n *OpenBazaarNode) SetListingInventory(l repo.Listing) error {
 
 	// If SKUs were omitted, set a default with unlimited inventory
 	if len(listingInv) == 0 {
-		err = n.Datastore.Inventory().Put(slug, 0, -1)
+		err = n.Datastore.Inventory().Put(slug, 0, big.NewInt(-1))
 		if err != nil {
 			return err
 		}
@@ -678,7 +678,7 @@ func (n *OpenBazaarNode) GetListingFromSlug(slug string) (*pb.SignedListing, err
 	for variant, count := range inventory {
 		for i, s := range sl.Listing.Item.Skus {
 			if variant == i {
-				s.BigQuantity = fmt.Sprintf("%d", count)
+				s.BigQuantity = count.String()
 				break
 			}
 		}

core/order.go

@@ -1471,7 +1471,7 @@ collectListings:
 	type inventory struct {
 		Slug    string
 		Variant int
-		Count   int64
+		Count   *big.Int
 	}
 	var inventoryList []inventory
 	for _, item := range contract.BuyerOrder.Items {
@@ -1514,7 +1514,7 @@ collectListings:
 		}
 		// Create inventory paths to check later
 		if q := GetOrderQuantity(listingMap[item.ListingHash], item); q.IsInt64() {
-			inv.Count = q.Int64()
+			inv.Count = q
 		} else {
 			// TODO: https://github.com/OpenBazaar/openbazaar-go/issues/1739
 			return errors.New("big inventory quantity not supported")
@@ -1577,7 +1577,7 @@ collectListings:
 			if err != nil {
 				return errors.New("vendor has no inventory for the selected variant")
 			}
-			if amt >= 0 && amt < inv.Count {
+			if amt.Cmp(big.NewInt(0)) >= 0 && amt.Cmp(inv.Count) < 0 {
 				return NewErrOutOfInventory(amt)
 			}
 		}

core/signed_listings.go

@@ -1,8 +1,8 @@
 package core
 
 import (
-	"fmt"
 	"io/ioutil"
+	"math/big"
 
 	"github.com/OpenBazaar/jsonpb"
 	"github.com/OpenBazaar/openbazaar-go/pb"
@@ -39,11 +39,11 @@ func AssignMatchingCoupons(savedCoupons []repo.Coupon, sl *pb.SignedListing) err
 	return nil
 }
 
-func AssignMatchingQuantities(inventory map[int]int64, sl *pb.SignedListing) error {
+func AssignMatchingQuantities(inventory map[int]*big.Int, sl *pb.SignedListing) error {
 	for variant, count := range inventory {
 		for i, s := range sl.Listing.Item.Skus {
 			if variant == i {
-				s.BigQuantity = fmt.Sprintf("%d", count)
+				s.BigQuantity = count.String()
 				break
 			}
 		}

core/signed_listings_test.go

@@ -1,6 +1,7 @@
 package core_test
 
 import (
+	"math/big"
 	"path/filepath"
 	"testing"
 
@@ -76,8 +77,8 @@ func TestOpenBazaarSignedListings_AssignMatchingCoupons(t *testing.T) {
 func TestOpenBazaarSignedListings_AssignMatchingQuantities(t *testing.T) {
 	absPath, _ := filepath.Abs("../test/contracts/signed_listings_1.json")
 
-	inventory := map[int]int64{
-		0: 1000,
+	inventory := map[int]*big.Int{
+		0: big.NewInt(1000),
 	}
 
 	listing, err := core.GetSignedListingFromPath(absPath)

qa/manage_crypto_listings.py

@@ -45,7 +45,6 @@ def run_test(self):
             raise TestFailure("ManageCryptoListingsTest - FAIL: Incorrect listing count: %d", len(resp))
         for listing in resp:
             if listing['contractType'] == 'CRYPTOCURRENCY':
-                print(listing)
                 if listing["cryptoCurrencyCode"] != "TETH":
                     raise TestFailure("ManageCryptoListingsTest - FAIL: cryptoCurrencyCode incorrect: %s", listing["cryptoCurrencyCode"])
 

qa/market_price_modifier.py

@@ -44,7 +44,7 @@ def run_test(self):
             listing_json["metadata"]["coinDivisibility"] = 8
             listing_json["metadata"]["acceptedCurrencies"] = ["T" + self.cointype]
             listing_json_with_modifier = deepcopy(listing_json)
-            listing_json_with_modifier["metadata"]["priceModifier"] = self.price_modifier
+            listing_json_with_modifier["item"]["priceModifier"] = self.price_modifier
 
         api_url = vendor["gateway_url"] + "ob/listing"
         r = requests.post(api_url, data=json.dumps(listing_json, indent=4))
@@ -71,7 +71,7 @@ def run_test(self):
             raise TestFailure("MarketPriceModifierTest - FAIL: Couldn't get vendor local listings")
         resp = json.loads(r.text)
         for listing in resp:
-            if "modifier" not in listing["price"]:
+            if "modifier" not in listing:
                 raise TestFailure("MarketPriceModifierTest - FAIL: Vendor's local listings index doesn't include price modifier")
 
         # check vendor's listings from buyer and check for modifier
@@ -81,7 +81,7 @@ def run_test(self):
             raise TestFailure("MarketPriceModifierTest - FAIL: Couldn't get vendor listings from buyer")
         resp = json.loads(r.text)
         for listing in resp:
-            if "modifier" not in listing["price"]:
+            if "modifier" not in listing:
                 raise TestFailure("MarketPriceModifierTest - FAIL: Vendor's listings don't include price modifier from buyer")
 
         # get listing hashes
@@ -122,7 +122,7 @@ def run_test(self):
         with open('testdata/order_crypto.json') as order_file:
             order_json = json.load(order_file, object_pairs_hook=OrderedDict)
         order_json["items"][0]["listingHash"] = listing_id_with_modifier
-        order_json["paymentCoin"] = "t" + self.cointype
+        order_json["paymentCoin"] = "T" + self.cointype
         api_url = buyer["gateway_url"] + "ob/purchase"
         r = requests.post(api_url, data=json.dumps(order_json, indent=4))
         if r.status_code == 404: