Skip to content
This repository was archived by the owner on Mar 28, 2023. It is now read-only.

Commit 257a3e8

Browse files
cpaciacpacia
authored
Merge pull request #1863 from OpenBazaar/eth_fees
(#1859, #1860) Fix eth fees lookup
2 parents edf5d5d + 2fdf5de commit 257a3e8

File tree

21 files changed

+130
-175
lines changed

21 files changed

+130
-175
lines changed

‎api/jsonapi.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3423,7 +3423,7 @@ func (i *jsonAPIHandler) GETEstimateFee(w http.ResponseWriter, r *http.Request)
34233423
fee, err := wal.EstimateSpendFee(*amount, feeLevel)
34243424
if err != nil {
34253425
switch {
3426-
case err == wallet.ErrorInsuffientFunds:
3426+
case err == wallet.ErrInsufficientFunds:
34273427
ErrorResponse(w, http.StatusBadRequest, `ERROR_INSUFFICIENT_FUNDS`)
34283428
return
34293429
case err == wallet.ErrorDustAmount:

‎core/inbound_message_scanner.go

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"time"
55

66
"github.com/op/go-logging"
7-
libp2p "gx/ipfs/QmTW4SdgBWq9GjsBsHeUx8WuGxzhgzAf88UMH2w62PC8yK/go-libp2p-crypto"
87
"gx/ipfs/QmYVXrKrKHDC9FobgmcmshCDyWwdrfwfanNQN4oxJ9Fk3h/go-libp2p-peer"
98

109
"github.com/OpenBazaar/openbazaar-go/net"
@@ -33,16 +32,7 @@ type inboundMessageScanner struct {
3332
}
3433

3534
func peerIDExtractor(data []byte) (*peer.ID, error) {
36-
pubkey, err := libp2p.UnmarshalPublicKey(data)
37-
if err != nil {
38-
log.Errorf("err extracting peerID: %v", err.Error())
39-
return nil, err
40-
}
41-
i, err := peer.IDFromPublicKey(pubkey)
42-
if err != nil {
43-
log.Errorf("err extracting peerID: %v", err.Error())
44-
return nil, err
45-
}
35+
i := peer.ID(data)
4636
return &i, nil
4737
}
4838

‎core/net.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ func (n *OpenBazaarNode) SendOrder(peerID string, contract *pb.RicardianContract
319319
err = n.Datastore.Messages().Put(
320320
fmt.Sprintf("%s-%d", orderID0, int(pb.Message_ORDER)),
321321
orderID0, pb.Message_ORDER, peerID, repo.Message{Msg: m},
322-
"", 0, contract.VendorListings[0].VendorID.Pubkeys.Identity)
322+
"", 0, []byte{})
323323
if err != nil {
324324
log.Errorf("failed putting message (%s-%d): %v", orderID0, int(pb.Message_ORDER), err)
325325
}
@@ -360,7 +360,7 @@ func (n *OpenBazaarNode) SendOrderConfirmation(peerID string, contract *pb.Ricar
360360
err = n.Datastore.Messages().Put(
361361
fmt.Sprintf("%s-%d", orderID0, int(pb.Message_ORDER_CONFIRMATION)),
362362
orderID0, pb.Message_ORDER_CONFIRMATION, peerID, repo.Message{Msg: m},
363-
"", 0, contract.BuyerOrder.BuyerID.Pubkeys.Identity)
363+
"", 0, []byte{})
364364
if err != nil {
365365
log.Errorf("failed putting message (%s-%d): %v", orderID0, int(pb.Message_ORDER_CONFIRMATION), err)
366366
}
@@ -473,7 +473,7 @@ func (n *OpenBazaarNode) SendOrderFulfillment(peerID string, k *libp2p.PubKey, f
473473
err = n.Datastore.Messages().Put(
474474
fmt.Sprintf("%s-%d", orderID0, int(pb.Message_ORDER_FULFILLMENT)),
475475
orderID0, pb.Message_ORDER_FULFILLMENT, peerID, repo.Message{Msg: m},
476-
"", 0, fulfillmentMessage.VendorListings[0].VendorID.Pubkeys.Identity)
476+
"", 0, []byte{})
477477
if err != nil {
478478
log.Errorf("failed putting message (%s-%d): %v", orderID0, int(pb.Message_ORDER_FULFILLMENT), err)
479479
}
@@ -499,7 +499,7 @@ func (n *OpenBazaarNode) SendOrderCompletion(peerID string, k *libp2p.PubKey, co
499499
err = n.Datastore.Messages().Put(
500500
fmt.Sprintf("%s-%d", orderID0, int(pb.Message_ORDER_COMPLETION)),
501501
orderID0, pb.Message_ORDER_COMPLETION, peerID, repo.Message{Msg: m},
502-
"", 0, completionMessage.BuyerOrder.BuyerID.Pubkeys.Identity)
502+
"", 0, []byte{})
503503
if err != nil {
504504
log.Errorf("failed putting message (%s-%d): %v", orderID0, int(pb.Message_ORDER_COMPLETION), err)
505505
}

‎core/spend.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ func (n *OpenBazaarNode) Spend(args *SpendRequest) (*SpendResponse, error) {
104104
txid, err := wal.Spend(*amt, addr, feeLevel, args.OrderID, args.SpendAll)
105105
if err != nil {
106106
switch {
107-
case err == wallet.ErrorInsuffientFunds:
107+
case err == wallet.ErrInsufficientFunds:
108108
return nil, ErrInsufficientFunds
109109
case err == wallet.ErrorDustAmount:
110110
return nil, ErrSpendAmountIsDust

‎net/service/handlers.go

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ func (service *OpenBazaarService) handleOrder(peer peer.ID, pmes *pb.Message, op
335335
err = service.node.Datastore.Messages().Put(
336336
fmt.Sprintf("%s-%d", orderId, int(pb.Message_ORDER)),
337337
orderId, pb.Message_ORDER, peer.Pretty(), repo.Message{Msg: *pmes},
338-
"", time.Now().UnixNano(), contract.VendorListings[0].VendorID.Pubkeys.Identity)
338+
"", time.Now().UnixNano(), []byte(peer))
339339
if err != nil {
340340
log.Errorf("failed putting message (%s-%d): %v", orderId, int(pb.Message_ORDER), err)
341341
}
@@ -410,7 +410,7 @@ func (service *OpenBazaarService) handleOrder(peer peer.ID, pmes *pb.Message, op
410410
if err != nil {
411411
return errorResponse(err.Error()), err
412412
}
413-
addr, err := wal.DecodeAddress(order.Payment.Address)
413+
addr, err := wal.DecodeAddress(ut.NormalizeAddress(order.Payment.Address))
414414
if err != nil {
415415
return errorResponse(err.Error()), err
416416
}
@@ -447,7 +447,7 @@ func (service *OpenBazaarService) handleOrder(peer peer.ID, pmes *pb.Message, op
447447
if err != nil {
448448
return errorResponse(err.Error()), err
449449
}
450-
addr, err := wal.DecodeAddress(order.Payment.Address)
450+
addr, err := wal.DecodeAddress(ut.NormalizeAddress(order.Payment.Address))
451451
if err != nil {
452452
return errorResponse(err.Error()), err
453453
}
@@ -532,7 +532,7 @@ func (service *OpenBazaarService) handleOrderConfirmation(p peer.ID, pmes *pb.Me
532532
err = service.node.Datastore.Messages().Put(
533533
fmt.Sprintf("%s-%d", orderId, int(pb.Message_ORDER_CONFIRMATION)),
534534
orderId, pb.Message_ORDER_CONFIRMATION, p.Pretty(), repo.Message{Msg: *pmes},
535-
"", time.Now().UnixNano(), vendorContract.BuyerOrder.BuyerID.Pubkeys.Identity)
535+
"", time.Now().UnixNano(), []byte(p))
536536
if err != nil {
537537
log.Errorf("failed putting message (%s-%d): %v", orderId, int(pb.Message_ORDER_CONFIRMATION), err)
538538
}
@@ -634,7 +634,7 @@ func (service *OpenBazaarService) handleOrderCancel(p peer.ID, pmes *pb.Message,
634634
err = service.node.Datastore.Messages().Put(
635635
fmt.Sprintf("%s-%d", orderId, int(pb.Message_ORDER_CANCEL)),
636636
orderId, pb.Message_ORDER_CANCEL, p.Pretty(), repo.Message{Msg: *pmes},
637-
"", time.Now().UnixNano(), contract.BuyerOrder.BuyerID.Pubkeys.Identity)
637+
"", time.Now().UnixNano(), []byte(p))
638638
if err != nil {
639639
log.Errorf("failed putting message (%s-%d): %v", orderId, int(pb.Message_ORDER_CANCEL), err)
640640
}
@@ -712,7 +712,7 @@ func (service *OpenBazaarService) handleReject(p peer.ID, pmes *pb.Message, opti
712712
err = service.node.Datastore.Messages().Put(
713713
fmt.Sprintf("%s-%d", rejectMsg.OrderID, int(pb.Message_ORDER_REJECT)),
714714
rejectMsg.OrderID, pb.Message_ORDER_REJECT, p.Pretty(), repo.Message{Msg: *pmes},
715-
"", time.Now().UnixNano(), contract.BuyerOrder.BuyerID.Pubkeys.Identity)
715+
"", time.Now().UnixNano(), []byte(p))
716716
if err != nil {
717717
log.Errorf("failed putting message (%s-%d): %v", rejectMsg.OrderID, int(pb.Message_ORDER_REJECT), err)
718718
}
@@ -727,11 +727,11 @@ func (service *OpenBazaarService) handleReject(p peer.ID, pmes *pb.Message, opti
727727
var txInputs []wallet.TransactionInput
728728
for _, r := range records {
729729
if !r.Spent && r.Value.Cmp(big.NewInt(0)) > 0 {
730-
hash, err := hex.DecodeString(r.Txid)
730+
hash, err := hex.DecodeString(ut.NormalizeAddress(r.Txid))
731731
if err != nil {
732732
return nil, err
733733
}
734-
addr, err := wal.DecodeAddress(r.Address)
734+
addr, err := wal.DecodeAddress(ut.NormalizeAddress(r.Address))
735735
if err != nil {
736736
return nil, err
737737
}
@@ -762,7 +762,7 @@ func (service *OpenBazaarService) handleReject(p peer.ID, pmes *pb.Message, opti
762762
if err != nil {
763763
return nil, err
764764
}
765-
refundAddress, err := wal.DecodeAddress(order.RefundAddress)
765+
refundAddress, err := wal.DecodeAddress(ut.NormalizeAddress(order.RefundAddress))
766766
if err != nil {
767767
return nil, err
768768
}
@@ -775,7 +775,7 @@ func (service *OpenBazaarService) handleReject(p peer.ID, pmes *pb.Message, opti
775775
outValue := big.NewInt(0)
776776
for _, r := range records {
777777
if !r.Spent && r.Value.Cmp(big.NewInt(0)) > 0 {
778-
outpointHash, err := hex.DecodeString(r.Txid)
778+
outpointHash, err := hex.DecodeString(ut.NormalizeAddress(r.Txid))
779779
if err != nil {
780780
return nil, err
781781
}
@@ -785,7 +785,7 @@ func (service *OpenBazaarService) handleReject(p peer.ID, pmes *pb.Message, opti
785785
}
786786
}
787787

788-
refundAddress, err := wal.DecodeAddress(order.RefundAddress)
788+
refundAddress, err := wal.DecodeAddress(ut.NormalizeAddress(order.RefundAddress))
789789
if err != nil {
790790
return nil, err
791791
}
@@ -898,7 +898,7 @@ func (service *OpenBazaarService) handleRefund(p peer.ID, pmes *pb.Message, opti
898898
err = service.node.Datastore.Messages().Put(
899899
fmt.Sprintf("%s-%d", rc.Refund.OrderID, int(pb.Message_REFUND)),
900900
rc.Refund.OrderID, pb.Message_REFUND, p.Pretty(), repo.Message{Msg: *pmes},
901-
"", time.Now().UnixNano(), contract.VendorListings[0].VendorID.Pubkeys.Identity)
901+
"", time.Now().UnixNano(), []byte(p))
902902
if err != nil {
903903
log.Errorf("failed putting message (%s-%d): %v", rc.Refund.OrderID, int(pb.Message_REFUND), err)
904904
}
@@ -922,7 +922,7 @@ func (service *OpenBazaarService) handleRefund(p peer.ID, pmes *pb.Message, opti
922922
outValue := big.NewInt(0)
923923
for _, r := range records {
924924
if !r.Spent && r.Value.Cmp(big.NewInt(0)) > 0 {
925-
outpointHash, err := hex.DecodeString(r.Txid)
925+
outpointHash, err := hex.DecodeString(ut.NormalizeAddress(r.Txid))
926926
if err != nil {
927927
return nil, err
928928
}
@@ -932,7 +932,7 @@ func (service *OpenBazaarService) handleRefund(p peer.ID, pmes *pb.Message, opti
932932
}
933933
}
934934

935-
refundAddress, err := wal.DecodeAddress(order.RefundAddress)
935+
refundAddress, err := wal.DecodeAddress(ut.NormalizeAddress(order.RefundAddress))
936936
if err != nil {
937937
return nil, err
938938
}
@@ -1039,7 +1039,7 @@ func (service *OpenBazaarService) handleOrderFulfillment(p peer.ID, pmes *pb.Mes
10391039
err = service.node.Datastore.Messages().Put(
10401040
fmt.Sprintf("%s-%d", rc.VendorOrderFulfillment[0].OrderId, int(pb.Message_ORDER_FULFILLMENT)),
10411041
rc.VendorOrderFulfillment[0].OrderId, pb.Message_ORDER_FULFILLMENT, p.Pretty(), repo.Message{Msg: *pmes},
1042-
"", time.Now().UnixNano(), rc.VendorListings[0].VendorID.Pubkeys.Identity)
1042+
"", time.Now().UnixNano(), []byte(p))
10431043
if err != nil {
10441044
log.Errorf("failed putting message (%s-%d): %v", rc.VendorOrderFulfillment[0].OrderId, int(pb.Message_ORDER_FULFILLMENT), err)
10451045
}
@@ -1144,7 +1144,7 @@ func (service *OpenBazaarService) handleOrderCompletion(p peer.ID, pmes *pb.Mess
11441144
err = service.node.Datastore.Messages().Put(
11451145
fmt.Sprintf("%s-%d", rc.BuyerOrderCompletion.OrderId, int(pb.Message_ORDER_COMPLETION)),
11461146
rc.BuyerOrderCompletion.OrderId, pb.Message_ORDER_COMPLETION, p.Pretty(), repo.Message{Msg: *pmes},
1147-
"", time.Now().UnixNano(), rc.BuyerOrder.BuyerID.Pubkeys.Identity)
1147+
"", time.Now().UnixNano(), []byte(p))
11481148
if err != nil {
11491149
log.Errorf("failed putting message (%s-%d): %v", rc.BuyerOrderCompletion.OrderId, int(pb.Message_ORDER_COMPLETION), err)
11501150
}
@@ -1202,7 +1202,8 @@ func (service *OpenBazaarService) handleOrderCompletion(p peer.ID, pmes *pb.Mess
12021202
}
12031203
var payoutAddress btcutil.Address
12041204
if len(contract.VendorOrderFulfillment) > 0 {
1205-
payoutAddress, err = wal.DecodeAddress(contract.VendorOrderFulfillment[0].Payout.PayoutAddress)
1205+
payoutAddress, err = wal.DecodeAddress(
1206+
ut.NormalizeAddress(contract.VendorOrderFulfillment[0].Payout.PayoutAddress))
12061207
if err != nil {
12071208
return nil, err
12081209
}
@@ -1240,7 +1241,7 @@ func (service *OpenBazaarService) handleOrderCompletion(p peer.ID, pmes *pb.Mess
12401241
err0 := service.node.Datastore.Messages().Put(
12411242
fmt.Sprintf("%s-%d", rc.BuyerOrderCompletion.OrderId, int(pb.Message_ORDER_COMPLETION)),
12421243
rc.BuyerOrderCompletion.OrderId, pb.Message_ORDER_COMPLETION, p.Pretty(), repo.Message{Msg: *pmes},
1243-
err.Error(), time.Now().UnixNano(), contract.BuyerOrder.BuyerID.Pubkeys.Identity)
1244+
err.Error(), time.Now().UnixNano(), []byte(p))
12441245
if err0 != nil {
12451246
log.Errorf("failed putting message (%s-%d): %v", rc.BuyerOrderCompletion.OrderId, int(pb.Message_ORDER_COMPLETION), err0)
12461247
}
@@ -1310,7 +1311,7 @@ func (service *OpenBazaarService) handleDisputeOpen(p peer.ID, pmes *pb.Message,
13101311

13111312
err = service.node.Datastore.Messages().Put(
13121313
fmt.Sprintf("%s-%d", orderID, int(pb.Message_DISPUTE_OPEN)),
1313-
orderID, pb.Message_DISPUTE_OPEN, p.Pretty(), repo.Message{Msg: *pmes}, "", time.Now().UnixNano(), nil)
1314+
orderID, pb.Message_DISPUTE_OPEN, p.Pretty(), repo.Message{Msg: *pmes}, "", time.Now().UnixNano(), []byte(p))
13141315
if err != nil {
13151316
log.Errorf("failed putting message (%s-%d): %v", orderID, int(pb.Message_DISPUTE_OPEN), err)
13161317
}
@@ -1347,7 +1348,7 @@ func (service *OpenBazaarService) handleDisputeUpdate(p peer.ID, pmes *pb.Messag
13471348
orderID := update.OrderId
13481349
err = service.node.Datastore.Messages().Put(
13491350
fmt.Sprintf("%s-%d", orderID, int(pb.Message_DISPUTE_UPDATE)),
1350-
orderID, pb.Message_DISPUTE_UPDATE, p.Pretty(), repo.Message{Msg: *pmes}, "", time.Now().UnixNano(), nil)
1351+
orderID, pb.Message_DISPUTE_UPDATE, p.Pretty(), repo.Message{Msg: *pmes}, "", time.Now().UnixNano(), []byte(p))
13511352
if err != nil {
13521353
log.Errorf("failed putting message (%s-%d): %v", orderID, int(pb.Message_DISPUTE_UPDATE), err)
13531354
}
@@ -1449,7 +1450,7 @@ func (service *OpenBazaarService) handleDisputeClose(p peer.ID, pmes *pb.Message
14491450
orderID := rc.DisputeResolution.OrderId
14501451
err = service.node.Datastore.Messages().Put(
14511452
fmt.Sprintf("%s-%d", orderID, int(pb.Message_DISPUTE_CLOSE)),
1452-
orderID, pb.Message_DISPUTE_CLOSE, p.Pretty(), repo.Message{Msg: *pmes}, "", time.Now().UnixNano(), nil)
1453+
orderID, pb.Message_DISPUTE_CLOSE, p.Pretty(), repo.Message{Msg: *pmes}, "", time.Now().UnixNano(), []byte(p))
14531454
if err != nil {
14541455
log.Errorf("failed putting message (%s-%d): %v", orderID, int(pb.Message_DISPUTE_CLOSE), err)
14551456
}
@@ -1935,7 +1936,7 @@ func (service *OpenBazaarService) handleOrderPayment(peer peer.ID, pmes *pb.Mess
19351936
orderID := paymentDetails.OrderID
19361937
err = service.node.Datastore.Messages().Put(
19371938
fmt.Sprintf("%s-%d", orderID, int(pb.Message_ORDER_PAYMENT)),
1938-
orderID, pb.Message_ORDER_PAYMENT, peer.Pretty(), repo.Message{Msg: *pmes}, "", time.Now().UnixNano(), nil)
1939+
orderID, pb.Message_ORDER_PAYMENT, peer.Pretty(), repo.Message{Msg: *pmes}, "", time.Now().UnixNano(), []byte(peer))
19391940
if err != nil {
19401941
log.Errorf("failed putting message (%s-%d): %v", orderID, int(pb.Message_ORDER_PAYMENT), err)
19411942
}

‎openbazaar-qa

-541 KB
Binary file not shown.

‎qa/eth_cancel_direct_offline.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -143,12 +143,8 @@ def run_test(self):
143143
if r.status_code != 200:
144144
raise TestFailure("EthCancelDirectOfflineTest - FAIL: Couldn't load order from Bob")
145145
resp = json.loads(r.text)
146-
print("resp for bob after order fetch : ")
147-
print(resp)
148146
if resp["state"] != "CANCELED":
149147
raise TestFailure("EthCancelDirectOfflineTest - FAIL: Bob failed to save as canceled")
150-
##if "refundAddressTransaction" not in resp or resp["refundAddressTransaction"] == {}:
151-
## raise TestFailure("EthCancelDirectOfflineTest - FAIL: Bob failed to detect outgoing payment")
152148

153149
# startup alice again
154150
self.start_node(alice)
@@ -169,12 +165,6 @@ def run_test(self):
169165
if r.status_code == 200:
170166
resp = json.loads(r.text)
171167
confirmed = int(resp["confirmed"])
172-
print("confirmed : ", confirmed)
173-
print("bob bal : ", bob_balance)
174-
print("pymnt amt : ", int(payment_amount["amount"]))
175-
#unconfirmed = int(resp["unconfirmed"])
176-
##if confirmed <= bob_balance - int(payment_amount["amount"]):
177-
## raise TestFailure("EthCancelDirectOfflineTest - FAIL: Bob failed to receive the multisig payout")
178168
else:
179169
raise TestFailure("EthCancelDirectOfflineTest - FAIL: Failed to query Bob's balance")
180170

‎qa/eth_market_price_modifier.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def run_test(self):
7070
raise TestFailure("EthMarketPriceModifierTest - FAIL: Couldn't get vendor local listings")
7171
resp = json.loads(r.text)
7272
for listing in resp:
73-
if "modifier" not in listing["price"]:
73+
if "modifier" not in listing:
7474
raise TestFailure("EthMarketPriceModifierTest - FAIL: Vendor's local listings index doesn't include price modifier")
7575

7676
# check vendor's listings from buyer and check for modifier
@@ -80,7 +80,7 @@ def run_test(self):
8080
raise TestFailure("EthMarketPriceModifierTest - FAIL: Couldn't get vendor listings from buyer")
8181
resp = json.loads(r.text)
8282
for listing in resp:
83-
if "modifier" not in listing["price"]:
83+
if "modifier" not in listing:
8484
raise TestFailure("EthMarketPriceModifierTest - FAIL: Vendor's listings don't include price modifier from buyer")
8585

8686
# get listing hashes

‎qa/eth_purchase_crypto_listing.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def run_test(self):
5656
resp = json.loads(r.text)
5757
if r.status_code != 200:
5858
raise TestFailure("EthPurchaseCryptoListingTest - FAIL: Inventory get endpoint failed")
59-
if resp["ether"]["inventory"] != 350000000:
59+
if resp["ether"]["inventory"] != '350000000':
6060
raise TestFailure("EthPurchaseCryptoListingTest - FAIL: Inventory incorrect: %d", resp["ether"]["inventory"])
6161

6262
# get listing hash
@@ -65,7 +65,7 @@ def run_test(self):
6565
if r.status_code != 200:
6666
raise TestFailure("EthPurchaseCryptoListingTest - FAIL: Couldn't get listing index")
6767
resp = json.loads(r.text)
68-
if resp[0]["price"]["currency"]["code"] != "TETH":
68+
if resp[0]["coinType"] != "TETH":
6969
raise TestFailure("EthPurchaseCryptoListingTest - FAIL: Vendor incorrectly saved listings.json without a coinType")
7070
listingId = resp[0]["hash"]
7171

@@ -195,7 +195,7 @@ def run_test(self):
195195
resp = json.loads(r.text)
196196
if r.status_code != 200:
197197
raise TestFailure("EthPurchaseCryptoListingTest - FAIL: Inventory get endpoint failed")
198-
if resp["ether"]["inventory"] != 250000000:
198+
if resp["ether"]["inventory"] != "250000000":
199199
raise TestFailure("EthPurchaseCryptoListingTest - FAIL: Inventory incorrect: %d", resp["ether"]["inventory"])
200200

201201
print("EthPurchaseCryptoListingTest - PASS")

‎qa/eth_reject_direct_offline.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ def run_test(self):
143143
elif r.status_code != 200:
144144
resp = json.loads(r.text)
145145
raise TestFailure("EthRejectDirectOfflineTest - FAIL: OrderConfirmation POST failed. Reason: %s", resp["reason"])
146-
time.sleep(20)
146+
time.sleep(120)
147147

148148
# alice check order rejected correctly
149149
api_url = alice["gateway_url"] + "ob/order/" + orderId

0 commit comments

Comments
 (0)