From fa37152e2027ea201ea5e887f45d43958ecad3d8 Mon Sep 17 00:00:00 2001 From: Arthur Britto Date: Fri, 25 Jan 2013 14:24:34 -0800 Subject: [PATCH] UT: Update offer-test for new Transaction split. --- test/offer-test.js | 24 ++++++++++++------------ test/testutils.js | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/test/offer-test.js b/test/offer-test.js index 9e4fd417bb..c5ea1e0622 100644 --- a/test/offer-test.js +++ b/test/offer-test.js @@ -15,8 +15,8 @@ require("../src/js/remote").config = require("./config"); buster.testRunner.timeout = 5000; buster.testCase("Offer tests", { - 'setUp' : testutils.build_setup(), - // 'setUp' : testutils.build_setup({ verbose: true, standalone: false }), + // 'setUp' : testutils.build_setup(), + 'setUp' : testutils.build_setup({ verbose: true, standalone: false }), 'tearDown' : testutils.build_teardown(), "offer create then cancel in one ledger" : @@ -168,8 +168,8 @@ buster.testCase("Offer tests", { testutils.verify_balances(self.remote, { - "alice" : [ "499/USD/mtgox", String(100000000000+4000000000-2*(Remote.fees['default'].to_number())) ], - "bob" : [ "1/USD/mtgox", String(100000000000-4000000000-2*(Remote.fees['default'].to_number())) ], + "alice" : [ "499/USD/mtgox", String(100000000000+4000000000-2*(Transaction.fees['default'].to_number())) ], + "bob" : [ "1/USD/mtgox", String(100000000000-4000000000-2*(Transaction.fees['default'].to_number())) ], }, callback); }, @@ -224,7 +224,7 @@ buster.testCase("Offer tests", { self.what = "Create first offer."; self.remote.transaction() - .offer_create("alice", "150000.0", "50/USD/mtgox") + .offer_create("alice", "150000.0", "50/USD/mtgox") // 3000 XRP = 1 USD .on('proposed', function (m) { // console.log("PROPOSED: offer_create: %s", JSON.stringify(m)); @@ -236,7 +236,7 @@ buster.testCase("Offer tests", { self.what = "Create crossing offer."; self.remote.transaction() - .offer_create("bob", "1/USD/mtgox", "4000.0") + .offer_create("bob", "1/USD/mtgox", "3000.0") .on('proposed', function (m) { // console.log("PROPOSED: offer_create: %s", JSON.stringify(m)); @@ -249,8 +249,8 @@ buster.testCase("Offer tests", { testutils.verify_balances(self.remote, { - "alice" : [ "499/USD/mtgox", String(100000000000+4000000000-2*(Remote.fees['default'].to_number())) ], - "bob" : [ "1/USD/mtgox", String(100000000000-4000000000-2*(Remote.fees['default'].to_number())) ], + "alice" : [ "499/USD/mtgox", String(100000000000+3000000000-2*(Transaction.fees['default'].to_number())) ], + "bob" : [ "1/USD/mtgox", String(100000000000-3000000000-2*(Transaction.fees['default'].to_number())) ], }, callback); }, @@ -305,7 +305,7 @@ buster.testCase("Offer tests", { self.what = "Create first offer."; self.remote.transaction() - .offer_create("alice", "150000.0", "50/USD/mtgox") + .offer_create("alice", "150000.0", "50/USD/mtgox") // 300 XRP = 1 USD .on('proposed', function (m) { // console.log("PROPOSED: offer_create: %s", JSON.stringify(m)); @@ -328,7 +328,7 @@ buster.testCase("Offer tests", { self.what = "Create crossing offer."; self.remote.transaction() - .offer_create("bob", "1/USD/mtgox", "4000.0") + .offer_create("bob", "1/USD/mtgox", "3000.0") // .on('proposed', function (m) { // console.log("PROPOSED: offer_create: %s", JSON.stringify(m)); @@ -341,8 +341,8 @@ buster.testCase("Offer tests", { testutils.verify_balances(self.remote, { - "alice" : [ "499/USD/mtgox", String(100000000000+4000000000-2*(Remote.fees['default'].to_number())) ], - "bob" : [ "1/USD/mtgox", String(100000000000-4000000000-1*(Remote.fees['default'].to_number())) ], + "alice" : [ "499/USD/mtgox", String(100000000000+3000000000-2*(Transaction.fees['default'].to_number())) ], + "bob" : [ "1/USD/mtgox", String(100000000000-3000000000-1*(Transaction.fees['default'].to_number())) ], }, callback); }, diff --git a/test/testutils.js b/test/testutils.js index c0775c1e4b..deddc3009f 100644 --- a/test/testutils.js +++ b/test/testutils.js @@ -309,7 +309,7 @@ var verify_balance = function (remote, src, amount_json, callback) { var account_balance = Amount.from_json(m.account_balance); if (!account_balance.equals(amount_req)) { - console.log("verify_balance: failed: %s vs %s is %s: %s", src, account_balance.to_text_full(), amount_req.to_text_full(), account_balance.not_equals_why(amount_req)); + console.log("verify_balance: failed: %s vs %s / %s: %s", src, account_balance.to_text_full(), amount_req.to_text_full(), account_balance.not_equals_why(amount_req)); } callback(!account_balance.equals(amount_req));