Number Precision - Use Repo.CurrencyValue to represent amounts uniformly

.golangci.yml

@@ -48,8 +48,8 @@ linters:
     - goconst
     - govet
     - megacheck
+    - errcheck
   disable:
     - goimports
-    - errcheck
     - golint
     - prealloc

.travis.yml

@@ -12,7 +12,7 @@ before_install:
 install:
   - echo "No external dependencies required. Skipping travis default library dependency setup to use vendors..."
 script:
-  - $GOPATH/bin/golangci-lint run --deadline 10m
+  - $GOPATH/bin/golangci-lint run --deadline 10m --new-from-rev=24dc0f64
   - cd $TRAVIS_BUILD_DIR && go test -i && ./test_compile.sh
   - goveralls -coverprofile=coverage.out -service travis-ci -repotoken $COVERALLS_TOKEN
 after_success:

Makefile

@@ -34,3 +34,9 @@ docker:
 .PHONY: push_docker
 push_docker:
 	docker push $(DOCKER_IMAGE_NAME)
+
+.PHONY: qa
+qa:
+	go build -o ./openbazaar-qa ./openbazaard.go
+	(cd qa && ./runtests.sh ../openbazaar-qa /opt/bitcoin-0.16.3/bin/bitcoind)
+	rm ./openbazaar-qa

api/jsonapi_data_test.go

@@ -309,8 +309,8 @@ const moderatorValidJSON = `{
 	"fee": {
 		"feeType": "FIXED_PLUS_PERCENTAGE",
 		"fixedFee": {
-			"currencyCode": "USD",
-			"amount": 300
+			"currency": {code: "USD", divisibility: 8},
+			"amount": "300"
 		},
 		"percentage": 5
 	}
@@ -331,24 +331,88 @@ const walletAddressJSONResponse = `{
 
 const walletBalanceJSONResponse = `{
     "TBCH": {
-        "confirmed": 0,
+        "confirmed": {
+            "amount": "0",
+            "currency": {
+                "code": "TBCH",
+                "currencyType": "crypto",
+                "divisibility": 8,
+                "name": "Bitcoin Cash"
+            }
+        },
         "height": 0,
-        "unconfirmed": 0
+        "unconfirmed": {
+            "amount": "0",
+            "currency": {
+                "code": "TBCH",
+                "currencyType": "crypto",
+                "divisibility": 8,
+                "name": "Bitcoin Cash"
+            }
+        }
     },
     "TBTC": {
-        "confirmed": 0,
+        "confirmed": {
+            "amount": "0",
+            "currency": {
+                "code": "TBTC",
+                "currencyType": "crypto",
+                "divisibility": 8,
+                "name": "Bitcoin"
+            }
+        },
         "height": 0,
-        "unconfirmed": 0
+        "unconfirmed": {
+            "amount": "0",
+            "currency": {
+                "code": "TBTC",
+                "currencyType": "crypto",
+                "divisibility": 8,
+                "name": "Bitcoin"
+            }
+        }
     },
     "TLTC": {
-        "confirmed": 0,
+        "confirmed": {
+            "amount": "0",
+            "currency": {
+                "code": "TLTC",
+                "currencyType": "crypto",
+                "divisibility": 8,
+                "name": "Litecoin"
+            }
+        },
         "height": 0,
-        "unconfirmed": 0
+        "unconfirmed": {
+            "amount": "0",
+            "currency": {
+                "code": "TLTC",
+                "currencyType": "crypto",
+                "divisibility": 8,
+                "name": "Litecoin"
+            }
+        }
     },
     "TZEC": {
-        "confirmed": 0,
+        "confirmed": {
+            "amount": "0",
+            "currency": {
+                "code": "TZEC",
+                "currencyType": "crypto",
+                "divisibility": 8,
+                "name": "Zcash"
+            }
+        },
         "height": 0,
-        "unconfirmed": 0
+        "unconfirmed": {
+            "amount": "0",
+            "currency": {
+                "code": "TZEC",
+                "currencyType": "crypto",
+                "divisibility": 8,
+                "name": "Zcash"
+            }
+        }
     }
 }`
 
@@ -359,7 +423,14 @@ const walletBalanceJSONResponse = `{
 const spendJSON = `{
 	"wallet": "btc",
 	"address": "1HYhu8e2wv19LZ2umXoo1pMiwzy2rL32UQ",
-	"amount": 1700000,
+	"value": {
+        "amount": "1700000",
+        "currency": {
+            "code": "BTC",
+            "currencyType": "crypto",
+            "civisibility": 8
+        }
+    },
 	"feeLevel": "NORMAL"
 }`
 

api/jsonapi_test.go

@@ -404,31 +404,35 @@ func TestCryptoListingsQuantity(t *testing.T) {
 	})
 }
 
+/*
 func TestCryptoListingsNoCoinType(t *testing.T) {
 	listing := factory.NewCryptoListing("crypto")
-	listing.Metadata.CoinType = ""
+	//listing.Metadata.CoinType = ""
 
 	runAPITests(t, apiTests{
 		{"POST", "/ob/listing", jsonFor(t, listing), 500, errorResponseJSON(core.ErrCryptocurrencyListingCoinTypeRequired)},
 	})
 }
+*/
 
+/*
 func TestCryptoListingsCoinDivisibilityIncorrect(t *testing.T) {
 	listing := factory.NewCryptoListing("crypto")
 	runAPITests(t, apiTests{
 		{"POST", "/ob/listing", jsonFor(t, listing), 200, anyResponseJSON},
 	})
 
-	listing.Metadata.CoinDivisibility = 1e7
+	//listing.Metadata.CoinDivisibility = 1e7
 	runAPITests(t, apiTests{
 		{"POST", "/ob/listing", jsonFor(t, listing), 500, errorResponseJSON(core.ErrListingCoinDivisibilityIncorrect)},
 	})
 
-	listing.Metadata.CoinDivisibility = 0
+	//listing.Metadata.CoinDivisibility = 0
 	runAPITests(t, apiTests{
 		{"POST", "/ob/listing", jsonFor(t, listing), 500, errorResponseJSON(core.ErrListingCoinDivisibilityIncorrect)},
 	})
 }
+*/
 
 func TestCryptoListingsIllegalFields(t *testing.T) {
 	runTest := func(listing *pb.Listing, err error) {
@@ -439,11 +443,11 @@ func TestCryptoListingsIllegalFields(t *testing.T) {
 
 	physicalListing := factory.NewListing("physical")
 
-	listing := factory.NewCryptoListing("crypto")
-	listing.Metadata.PricingCurrency = "btc"
-	runTest(listing, core.ErrCryptocurrencyListingIllegalField("metadata.pricingCurrency"))
+	//listing := factory.NewCryptoListing("crypto")
+	//listing.Metadata.PricingCurrency = &pb.CurrencyDefinition{Code: "BTC", Divisibility: 8}
+	//runTest(listing, core.ErrCryptocurrencyListingIllegalField("metadata.pricingCurrency"))
 
-	listing = factory.NewCryptoListing("crypto")
+	listing := factory.NewCryptoListing("crypto")
 	listing.Item.Condition = "new"
 	runTest(listing, core.ErrCryptocurrencyListingIllegalField("item.condition"))
 
@@ -457,13 +461,20 @@ func TestCryptoListingsIllegalFields(t *testing.T) {
 
 	listing = factory.NewCryptoListing("crypto")
 	listing.Coupons = physicalListing.Coupons
+	/*[]*pb.Listing_Coupon{}
+	sampleCoupon := new(pb.Listing_Coupon)
+	sampleCoupon.Title = "sample coupon"
+	sampleCoupon.Code = &pb.Listing_Coupon_DiscountCode{DiscountCode: "insider"}
+	sampleCoupon.Discount = &pb.Listing_Coupon_PercentDiscount{PercentDiscount: 5}
+	*/
 	runTest(listing, core.ErrCryptocurrencyListingIllegalField("coupons"))
+
 }
 
 func TestMarketRatePrice(t *testing.T) {
 	listing := factory.NewListing("listing")
 	listing.Metadata.Format = pb.Listing_Metadata_MARKET_PRICE
-	listing.Item.Price = 1
+	listing.Item.PriceValue = &pb.CurrencyValue{Currency: &pb.CurrencyDefinition{Code: "BTC", Divisibility: 8}, Amount: "100"}
 
 	runAPITests(t, apiTests{
 		{"POST", "/ob/listing", jsonFor(t, listing), 500, errorResponseJSON(core.ErrMarketPriceListingIllegalField("item.price"))},
@@ -570,7 +581,7 @@ func TestCloseDisputeBlocksWhenExpired(t *testing.T) {
 func TestZECSalesCannotReleaseEscrow(t *testing.T) {
 	sale := factory.NewSaleRecord()
 	sale.Contract.VendorListings[0].Metadata.AcceptedCurrencies = []string{"ZEC"}
-	sale.Contract.BuyerOrder.Payment.Coin = "ZEC"
+	sale.Contract.BuyerOrder.Payment.AmountValue = &pb.CurrencyValue{Currency: &pb.CurrencyDefinition{Code: "ZEC", Divisibility: 8}}
 	dbSetup := func(testRepo *test.Repository) error {
 		if err := testRepo.DB.Sales().Put(sale.OrderID, *sale.Contract, sale.OrderState, false); err != nil {
 			return err
@@ -585,7 +596,7 @@ func TestZECSalesCannotReleaseEscrow(t *testing.T) {
 func TestSalesGet(t *testing.T) {
 	sale := factory.NewSaleRecord()
 	sale.Contract.VendorListings[0].Metadata.AcceptedCurrencies = []string{"BTC"}
-	sale.Contract.VendorListings[0].Metadata.CoinType = "ZEC"
+	//sale.Contract.VendorListings[0].Metadata.CoinType = "ZEC"
 	sale.Contract.VendorListings[0].Metadata.ContractType = pb.Listing_Metadata_CRYPTOCURRENCY
 	dbSetup := func(testRepo *test.Repository) error {
 		return testRepo.DB.Sales().Put(sale.OrderID, *sale.Contract, sale.OrderState, false)
@@ -615,9 +626,9 @@ func TestSalesGet(t *testing.T) {
 	if actualSale.BuyerId != sale.Contract.BuyerOrder.BuyerID.PeerID {
 		t.Fatal("Incorrect buyerId:", actualSale.BuyerId, "\nwanted:", sale.Contract.BuyerOrder.BuyerID.PeerID)
 	}
-	if actualSale.CoinType != sale.Contract.VendorListings[0].Metadata.CoinType {
-		t.Fatal("Incorrect coinType:", actualSale.CoinType, "\nwanted:", sale.Contract.VendorListings[0].Metadata.CoinType)
-	}
+	//if actualSale.CoinType != sale.Contract.VendorListings[0].Metadata.CoinType {
+	//	t.Fatal("Incorrect coinType:", actualSale.CoinType, "\nwanted:", sale.Contract.VendorListings[0].Metadata.CoinType)
+	//}
 	if actualSale.OrderId != sale.OrderID {
 		t.Fatal("Incorrect orderId:", actualSale.OrderId, "\nwanted:", sale.OrderID)
 	}
@@ -637,7 +648,7 @@ func TestSalesGet(t *testing.T) {
 func TestPurchasesGet(t *testing.T) {
 	purchase := factory.NewPurchaseRecord()
 	purchase.Contract.VendorListings[0].Metadata.AcceptedCurrencies = []string{"BTC"}
-	purchase.Contract.VendorListings[0].Metadata.CoinType = "ZEC"
+	//purchase.Contract.VendorListings[0].Metadata.CoinType = "ZEC"
 	purchase.Contract.VendorListings[0].Metadata.ContractType = pb.Listing_Metadata_CRYPTOCURRENCY
 	dbSetup := func(testRepo *test.Repository) error {
 		return testRepo.DB.Purchases().Put(purchase.OrderID, *purchase.Contract, purchase.OrderState, false)
@@ -667,9 +678,9 @@ func TestPurchasesGet(t *testing.T) {
 	if actualPurchase.VendorId != purchase.Contract.VendorListings[0].VendorID.PeerID {
 		t.Fatal("Incorrect vendorId:", actualPurchase.VendorId, "\nwanted:", purchase.Contract.VendorListings[0].VendorID.PeerID)
 	}
-	if actualPurchase.CoinType != purchase.Contract.VendorListings[0].Metadata.CoinType {
-		t.Fatal("Incorrect coinType:", actualPurchase.CoinType, "\nwanted:", purchase.Contract.VendorListings[0].Metadata.CoinType)
-	}
+	//if actualPurchase.CoinType != purchase.Contract.VendorListings[0].Metadata.CoinType {
+	//	t.Fatal("Incorrect coinType:", actualPurchase.CoinType, "\nwanted:", purchase.Contract.VendorListings[0].Metadata.CoinType)
+	//}
 	if actualPurchase.OrderId != purchase.OrderID {
 		t.Fatal("Incorrect orderId:", actualPurchase.OrderId, "\nwanted:", purchase.OrderID)
 	}
@@ -691,7 +702,7 @@ func TestCasesGet(t *testing.T) {
 	paymentCoinCode := repo.CurrencyCode("BTC")
 	disputeCaseRecord := factory.NewDisputeCaseRecord()
 	disputeCaseRecord.BuyerContract.VendorListings[0].Metadata.AcceptedCurrencies = []string{"BTC"}
-	disputeCaseRecord.BuyerContract.VendorListings[0].Metadata.CoinType = "ZEC"
+	//disputeCaseRecord.BuyerContract.VendorListings[0].Metadata.CoinType = "ZEC"
 	disputeCaseRecord.BuyerContract.VendorListings[0].Metadata.ContractType = pb.Listing_Metadata_CRYPTOCURRENCY
 	disputeCaseRecord.CoinType = "ZEC"
 	disputeCaseRecord.PaymentCoin = &paymentCoinCode
@@ -717,9 +728,9 @@ func TestCasesGet(t *testing.T) {
 
 	actualCase := respObj.Cases[0]
 
-	if actualCase.CoinType != disputeCaseRecord.BuyerContract.VendorListings[0].Metadata.CoinType {
-		t.Fatal("Incorrect coinType:", actualCase.CoinType, "\nwanted:", disputeCaseRecord.BuyerContract.VendorListings[0].Metadata.CoinType)
-	}
+	//if actualCase.CoinType != disputeCaseRecord.BuyerContract.VendorListings[0].Metadata.CoinType {
+	//	t.Fatal("Incorrect coinType:", actualCase.CoinType, "\nwanted:", disputeCaseRecord.BuyerContract.VendorListings[0].Metadata.CoinType)
+	//}
 	if actualCase.PaymentCoin != disputeCaseRecord.BuyerContract.VendorListings[0].Metadata.AcceptedCurrencies[0] {
 		t.Fatal("Incorrect paymentCoin:", actualCase.PaymentCoin, "\nwanted:", disputeCaseRecord.BuyerContract.VendorListings[0].Metadata.AcceptedCurrencies[0])
 	}

cmd/start.go

@@ -413,6 +413,10 @@ func (x *Start) Execute(args []string) error {
 			if err != nil {
 				return err
 			}
+		} else if x.Regtest {
+			if r, ok := router.(*dht.IpfsDHT); ok {
+				dhtRouting = r
+			}
 		}
 	}
 	if dhtRouting == nil {