This commit is contained in:
jed
2012-11-15 13:17:36 -08:00
parent 850c7004c8
commit 7c69c45a2f
4 changed files with 18 additions and 20 deletions

View File

@@ -1355,7 +1355,7 @@ Transaction.prototype.password_fund = function (src, dst) {
Transaction.prototype.password_set = function (src, authorized_key, generator, public_key, signature) { Transaction.prototype.password_set = function (src, authorized_key, generator, public_key, signature) {
this.secret = this._account_secret(src); this.secret = this._account_secret(src);
this.tx_json.TransactionType = 'PasswordSet'; this.tx_json.TransactionType = 'PasswordSet';
this.tx_json.AuthorizedKey = authorized_key; this.tx_json.RegularKey = authorized_key;
this.tx_json.Generator = generator; this.tx_json.Generator = generator;
this.tx_json.PublicKey = public_key; this.tx_json.PublicKey = public_key;
this.tx_json.Signature = signature; this.tx_json.Signature = signature;
@@ -1412,7 +1412,7 @@ Transaction.prototype.wallet_add = function (src, amount, authorized_key, public
this.secret = this._account_secret(src); this.secret = this._account_secret(src);
this.tx_json.TransactionType = 'WalletAdd'; this.tx_json.TransactionType = 'WalletAdd';
this.tx_json.Amount = Amount.json_rewrite(amount); this.tx_json.Amount = Amount.json_rewrite(amount);
this.tx_json.AuthorizedKey = authorized_key; this.tx_json.RegularKey = authorized_key;
this.tx_json.PublicKey = public_key; this.tx_json.PublicKey = public_key;
this.tx_json.Signature = signature; this.tx_json.Signature = signature;

View File

@@ -5,7 +5,8 @@
var path = require("path"); var path = require("path");
// Where to find the binary. // Where to find the binary.
exports.rippled = path.join(process.cwd(), "build/rippled"); //exports.rippled = path.join(process.cwd(), "newcoin_master");
exports.rippled = path.join(process.cwd(), "Debug/newcoin");
exports.server_default = "alpha"; exports.server_default = "alpha";

View File

@@ -15,8 +15,9 @@ var serverDelay = 1500;
buster.testRunner.timeout = 5000; buster.testRunner.timeout = 5000;
/*
buster.testCase("Simple", { buster.testCase("Simple", {
'setUp' : testutils.build_setup({no_server: true}), 'setUp' : testutils.build_setup({no_server: true}), //
'tearDown' : testutils.build_teardown(), 'tearDown' : testutils.build_teardown(),
"simple." : "simple." :
@@ -35,13 +36,13 @@ buster.testCase("Simple", {
}).submit(); }).submit();
} }
}); }); */
buster.testCase("Sending", { buster.testCase("Sending", {
'setUp' : testutils.build_setup(), 'setUp' : testutils.build_setup(),
'tearDown' : testutils.build_teardown(), 'tearDown' : testutils.build_teardown(),
"=> send XRP to non-existent account without create." : "send XRP to non-existent account without create." :
function (done) { function (done) {
var self = this; var self = this;
var ledgers = 20; var ledgers = 20;
@@ -51,11 +52,8 @@ buster.testCase("Sending", {
.payment('root', 'alice', "10000") .payment('root', 'alice', "10000")
.on('success', function (r) { .on('success', function (r) {
// Transaction sent. // Transaction sent.
// buster.assert(false, "Succeded.");
// done(); // console.log("success: %s", JSON.stringify(r));
buster.assert.equals(r.result, 'terNO_DST');
console.log("success: %s", JSON.stringify(r));
done();
}) })
.on('pending', function() { .on('pending', function() {
// Moving ledgers along. // Moving ledgers along.
@@ -79,11 +77,11 @@ buster.testCase("Sending", {
}) })
.on('proposed', function (m) { .on('proposed', function (m) {
// Transaction got an error. // Transaction got an error.
console.log("proposed: %s", JSON.stringify(m)); // console.log("proposed: %s", JSON.stringify(m));
buster.assert.equals(m.result, 'terNO_DST'); buster.assert.equals(m.result, 'terNO_DST');
//done();
got_proposed = true; got_proposed = true;
self.remote.ledger_accept(); // Move it along. self.remote.ledger_accept(); // Move it along.
}) })
@@ -97,7 +95,6 @@ buster.testCase("Sending", {
// console.log("error: %s", m); // console.log("error: %s", m);
buster.assert(false); buster.assert(false);
done();
}) })
.submit(); .submit();
}, },
@@ -108,7 +105,7 @@ buster.testCase("Sending", {
this.remote.transaction() this.remote.transaction()
.ripple_line_set("root", "100/USD/alice") .ripple_line_set("root", "100/USD/alice")
.on('proposed', function (m) { .on('proposed', function (m) {
console.log("proposed: %s", JSON.stringify(m)); //console.log("proposed: %s", JSON.stringify(m));
buster.assert.equals(m.result, 'terNO_DST'); buster.assert.equals(m.result, 'terNO_DST');
@@ -116,7 +113,7 @@ buster.testCase("Sending", {
}) })
.submit(); .submit();
}, },
/*
"credit_limit" : "credit_limit" :
function (done) { function (done) {
var self = this; var self = this;
@@ -259,7 +256,7 @@ buster.testCase("Sending", {
buster.refute(error, self.what); buster.refute(error, self.what);
done(); done();
}); });
},*/ },
}); });
// XXX In the future add ledger_accept after partial retry is implemented in the server. // XXX In the future add ledger_accept after partial retry is implemented in the server.
@@ -267,7 +264,7 @@ buster.testCase("Sending future", {
'setUp' : testutils.build_setup(), 'setUp' : testutils.build_setup(),
'tearDown' : testutils.build_teardown(), 'tearDown' : testutils.build_teardown(),
"direct ripple" : "=> direct ripple" :
function (done) { function (done) {
var self = this; var self = this;

View File

@@ -22,7 +22,7 @@ var account_dump = function (remote, account, callback) {
.ledger_hash(remote.ledger_hash()) .ledger_hash(remote.ledger_hash())
.account_root("root") .account_root("root")
.on('success', function (r) { .on('success', function (r) {
console.log("account_root: %s", JSON.stringify(r, undefined, 2)); //console.log("account_root: %s", JSON.stringify(r, undefined, 2));
callback(); callback();
}) })