ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-11-21 02:55:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

UT: More fixes for API changes, remote-test.js works.

Browse Source
This commit is contained in:
Arthur Britto
2012-11-05 21:41:52 -08:00
parent 595fd7d762
commit cc299d3bb8
2 changed files with 39 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
js/remote.js
View File

@@ -78,7 +78,7 @@ Request.prototype.ledger_choose = function (current) {
// - ledger_entry // - ledger_entry
// - transaction_entry // - transaction_entry
Request.prototype.ledger_hash = function (h) { Request.prototype.ledger_hash = function (h) {
this.message.ledger_hash = n; this.message.ledger_hash = h;
return this; return this;
}; };
@@ -482,7 +482,7 @@ Remote.prototype.request_ledger_hash = function () {
var request = new Request(this, 'rpc'); var request = new Request(this, 'rpc');
request.rpc_command = 'ledger_closed'; request.message.rpc_command = 'ledger_closed';
return request; return request;
}; };
@@ -492,7 +492,7 @@ Remote.prototype.request_ledger_hash = function () {
Remote.prototype.request_ledger_current = function () { Remote.prototype.request_ledger_current = function () {
var request = new Request(this, 'rpc'); var request = new Request(this, 'rpc');
request.rpc_command = 'ledger_current'; request.message.rpc_command = 'ledger_current';
return request; return request;
}; };
@@ -503,7 +503,9 @@ Remote.prototype.request_ledger_entry = function (type) {
assert(this.trusted); // If not trusted, need to check proof, maybe talk packet protocol. assert(this.trusted); // If not trusted, need to check proof, maybe talk packet protocol.
var self = this; var self = this;
var request = new Request(this, 'ledger_entry'); var request = new Request(this, 'rpc');
request.message.rpc_command = 'ledger_entry';
if (type) if (type)
this.type = type; this.type = type;
@@ -559,7 +561,7 @@ Remote.prototype.request_ledger_entry = function (type) {
Remote.prototype.request_subscribe = function () { Remote.prototype.request_subscribe = function () {
var request = new Request(this, 'subscribe'); var request = new Request(this, 'subscribe');
request.message.streams = [ 'ledger' ]; request.message.streams = [ 'ledger', 'server' ];
return request; return request;
}; };
@@ -567,7 +569,11 @@ Remote.prototype.request_subscribe = function () {
Remote.prototype.request_transaction_entry = function (hash) { Remote.prototype.request_transaction_entry = function (hash) {
assert(this.trusted); // If not trusted, need to check proof, maybe talk packet protocol. assert(this.trusted); // If not trusted, need to check proof, maybe talk packet protocol.
return (new Request(this, 'transaction_entry')) var request = new Request(this, 'rpc');
request.message.rpc_command = 'transaction_entry';
return request
.tx_hash(hash); .tx_hash(hash);
}; };
@@ -615,7 +621,9 @@ Remote.prototype.submit = function (transaction) {
.request(); .request();
} }
else { else {
var submit_request = new Request(this, 'submit'); var submit_request = new Request(this, 'rpc');
submit_request.message.rpc_command = 'submit_json';
submit_request.tx_json(transaction.tx_json); submit_request.tx_json(transaction.tx_json);
submit_request.secret(transaction.secret); submit_request.secret(transaction.secret);
@@ -670,7 +678,11 @@ Remote.prototype._server_subscribe = function () {
Remote.prototype.ledger_accept = function () { Remote.prototype.ledger_accept = function () {
if (this.stand_alone || undefined === this.stand_alone) if (this.stand_alone || undefined === this.stand_alone)
{ {
(new Request(this, 'ledger_accept')) var request = new Request(this, 'rpc');
request.message.rpc_command = 'ledger_accept';
request
.request(); .request();
} }
else { else {
@@ -984,7 +996,7 @@ Transaction.prototype.submit = function () {
// XXX make sure self.hash is available. // XXX make sure self.hash is available.
self.remote.request_transaction_entry(self.hash) self.remote.request_transaction_entry(self.hash)
.ledger_closed(ledger_hash) .ledger_hash(ledger_hash)
.on('success', function (message) { .on('success', function (message) {
self.set_state(message.metadata.TransactionResult); self.set_state(message.metadata.TransactionResult);
self.emit('final', message); self.emit('final', message);

35
test/remote-test.js
View File

@@ -17,7 +17,7 @@ buster.testCase("Remote functions", {
'setUp' : testutils.build_setup(), 'setUp' : testutils.build_setup(),
'tearDown' : testutils.build_teardown(), 'tearDown' : testutils.build_teardown(),
'request_ledger_current' : "request_ledger_current" :
function (done) { function (done) {
this.remote.request_ledger_current().on('success', function (m) { this.remote.request_ledger_current().on('success', function (m) {
// console.log(m); // console.log(m);
@@ -30,15 +30,16 @@ buster.testCase("Remote functions", {
buster.assert(false); buster.assert(false);
}) })
.request(); .request();
}, },
'request_ledger_closed' : "request_ledger_hash" :
function (done) { function (done) {
this.remote.request_ledger_closed().on('success', function (m) { this.remote.request_ledger_hash().on('success', function (m) {
// console.log("result: %s", JSON.stringify(m)); // console.log("result: %s", JSON.stringify(m));
buster.assert.equals(m.ledger_closed_index, 2); buster.assert.equals(m.ledger_index, 2);
done(); done();
}) })
.on('error', function(m) { .on('error', function(m) {
@@ -49,16 +50,16 @@ buster.testCase("Remote functions", {
.request(); .request();
}, },
'manual account_root success' : "manual account_root success" :
function (done) { function (done) {
var self = this; var self = this;
this.remote.request_ledger_closed().on('success', function (r) { this.remote.request_ledger_hash().on('success', function (r) {
// console.log("result: %s", JSON.stringify(r)); // console.log("result: %s", JSON.stringify(r));
self.remote self.remote
.request_ledger_entry('account_root') .request_ledger_entry('account_root')
.ledger_closed(r.ledger_closed) .ledger_hash(r.ledger_hash)
.account_root("rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh") .account_root("rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh")
.on('success', function (r) { .on('success', function (r) {
// console.log("account_root: %s", JSON.stringify(r)); // console.log("account_root: %s", JSON.stringify(r));
@@ -82,16 +83,16 @@ buster.testCase("Remote functions", {
}, },
// XXX This should be detected locally. // XXX This should be detected locally.
'account_root remote malformedAddress' : "account_root remote malformedAddress" :
function (done) { function (done) {
var self = this; var self = this;
this.remote.request_ledger_closed().on('success', function (r) { this.remote.request_ledger_hash().on('success', function (r) {
// console.log("result: %s", JSON.stringify(r)); // console.log("result: %s", JSON.stringify(r));
self.remote self.remote
.request_ledger_entry('account_root') .request_ledger_entry('account_root')
.ledger_closed(r.ledger_closed) .ledger_hash(r.ledger_hash)
.account_root("zHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh") .account_root("zHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh")
.on('success', function (r) { .on('success', function (r) {
// console.log("account_root: %s", JSON.stringify(r)); // console.log("account_root: %s", JSON.stringify(r));
@@ -115,16 +116,16 @@ buster.testCase("Remote functions", {
.request(); .request();
}, },
'account_root entryNotFound' : "account_root entryNotFound" :
function (done) { function (done) {
var self = this; var self = this;
this.remote.request_ledger_closed().on('success', function (r) { this.remote.request_ledger_hash().on('success', function (r) {
// console.log("result: %s", JSON.stringify(r)); // console.log("result: %s", JSON.stringify(r));
self.remote self.remote
.request_ledger_entry('account_root') .request_ledger_entry('account_root')
.ledger_closed(r.ledger_closed) .ledger_hash(r.ledger_hash)
.account_root("alice") .account_root("alice")
.on('success', function (r) { .on('success', function (r) {
// console.log("account_root: %s", JSON.stringify(r)); // console.log("account_root: %s", JSON.stringify(r));
@@ -147,16 +148,16 @@ buster.testCase("Remote functions", {
}).request(); }).request();
}, },
'ledger_entry index' : "ledger_entry index" :
function (done) { function (done) {
var self = this; var self = this;
this.remote.request_ledger_closed().on('success', function (r) { this.remote.request_ledger_hash().on('success', function (r) {
// console.log("result: %s", JSON.stringify(r)); // console.log("result: %s", JSON.stringify(r));
self.remote self.remote
.request_ledger_entry('index') .request_ledger_entry('index')
.ledger_closed(r.ledger_closed) .ledger_hash(r.ledger_hash)
.account_root("alice") .account_root("alice")
.index("2B6AC232AA4C4BE41BF49D2459FA4A0347E1B543A4C92FCEE0821C0201E2E9A8") .index("2B6AC232AA4C4BE41BF49D2459FA4A0347E1B543A4C92FCEE0821C0201E2E9A8")
.on('success', function (r) { .on('success', function (r) {
@@ -180,7 +181,7 @@ buster.testCase("Remote functions", {
.request(); .request();
}, },
'create account' : "create account" :
function (done) { function (done) {
this.remote.transaction() this.remote.transaction()
.payment('root', 'alice', Amount.from_json("10000")) .payment('root', 'alice', Amount.from_json("10000"))