JS: Clean up setting command rpc.

This commit is contained in:
Arthur Britto
2012-11-13 14:05:31 -08:00
parent ad8c942370
commit 496fd33481
2 changed files with 18 additions and 56 deletions

View File

@@ -1165,7 +1165,6 @@ std::map<RippleAddress,bool> NetworkOPs::getAffectedAccounts(const SerializedTra
const STAccount* sa = dynamic_cast<const STAccount*>(&it); const STAccount* sa = dynamic_cast<const STAccount*>(&it);
if (sa) if (sa)
{ {
bool found = false;
RippleAddress na = sa->getValueNCA(); RippleAddress na = sa->getValueNCA();
accounts[na]=true; accounts[na]=true;
}else }else

View File

@@ -530,21 +530,16 @@ Remote.prototype.request = function (request) {
}; };
Remote.prototype.request_server_info = function () { Remote.prototype.request_server_info = function () {
var request = new Request(this, 'rpc'); return new Request(this, 'server_info');
request.message.command = 'server_info';
return request;
}; };
Remote.prototype.request_ledger = function (params) { Remote.prototype.request_ledger = function (params) {
// XXX Does this require the server to be trusted? // XXX Does this require the server to be trusted?
//assert(this.trusted); //assert(this.trusted);
var request = new Request(this, 'rpc'); var request = new Request(this, 'ledger');
request.message.command = 'ledger'; request.message.params = params;
request.message.params = params;
return request; return request;
}; };
@@ -553,21 +548,13 @@ Remote.prototype.request_ledger = function (params) {
Remote.prototype.request_ledger_hash = function () { Remote.prototype.request_ledger_hash = function () {
assert(this.trusted); // If not trusted, need to check proof. assert(this.trusted); // If not trusted, need to check proof.
var request = new Request(this, 'rpc'); return new Request(this, 'ledger_closed');
request.message.command = 'ledger_closed';
return request;
}; };
// Get the current proposed ledger entry. May be closed (and revised) at any time (even before returning). // Get the current proposed ledger entry. May be closed (and revised) at any time (even before returning).
// Only for unit testing. // Only for unit testing.
Remote.prototype.request_ledger_current = function () { Remote.prototype.request_ledger_current = function () {
var request = new Request(this, 'rpc'); return new Request(this, 'ledger_current');
request.message.command = 'ledger_current';
return request;
}; };
// --> type : the type of ledger entry. // --> type : the type of ledger entry.
@@ -578,9 +565,7 @@ 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, 'rpc'); var request = new Request(this, 'ledger_entry');
request.message.command = 'ledger_entry';
if (type) if (type)
this.type = type; this.type = type;
@@ -662,11 +647,7 @@ Remote.prototype.request_unsubscribe = function (streams) {
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.
var request = new Request(this, 'rpc'); return (new Request(this, 'transaction_entry'))
request.message.command = 'transaction_entry';
return request
.tx_hash(hash); .tx_hash(hash);
}; };
@@ -674,9 +655,8 @@ Remote.prototype.request_ripple_lines_get = function (accountID) {
// XXX Does this require the server to be trusted? // XXX Does this require the server to be trusted?
//assert(this.trusted); //assert(this.trusted);
var request = new Request(this, 'rpc'); var request = new Request(this, 'ripple_lines_get');
request.message.command = 'ripple_lines_get';
// XXX Convert API call to JSON // XXX Convert API call to JSON
request.message.params = [accountID]; request.message.params = [accountID];
@@ -687,9 +667,8 @@ Remote.prototype.request_wallet_accounts = function (key) {
// XXX Does this require the server to be trusted? // XXX Does this require the server to be trusted?
//assert(this.trusted); //assert(this.trusted);
var request = new Request(this, 'rpc'); var request = new Request(this, 'wallet_accounts');
request.message.command = 'wallet_accounts';
// XXX Convert API call to JSON // XXX Convert API call to JSON
request.message.params = [key]; request.message.params = [key];
@@ -700,9 +679,8 @@ Remote.prototype.request_account_tx = function (accountID, minLedger, maxLedger)
// XXX Does this require the server to be trusted? // XXX Does this require the server to be trusted?
//assert(this.trusted); //assert(this.trusted);
var request = new Request(this, 'rpc'); var request = new Request(this, 'account_tx');
request.message.command = 'account_tx';
// XXX Convert API call to JSON // XXX Convert API call to JSON
request.message.params = [accountID, minLedger, maxLedger]; request.message.params = [accountID, minLedger, maxLedger];
@@ -751,9 +729,7 @@ Remote.prototype.submit = function (transaction) {
.request(); .request();
} }
else { else {
var submit_request = new Request(this, 'rpc'); var submit_request = new Request(this, 'submit_json');
submit_request.message.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);
@@ -808,9 +784,7 @@ 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)
{ {
var request = new Request(this, 'rpc'); var request = new Request(this, 'ledger_accept');
request.message.command = 'ledger_accept';
request request
.request(); .request();
@@ -957,43 +931,32 @@ Remote.prototype.request_ripple_balance = function (account, issuer, currency, c
} }
Remote.prototype.request_unl_list = function () { Remote.prototype.request_unl_list = function () {
var request = new Request(this, 'rpc'); return new Request(this, 'unl_list');
request.message.command = 'unl_list';
return request;
}; };
Remote.prototype.request_unl_add = function (addr, note) { Remote.prototype.request_unl_add = function (addr, note) {
var request = new Request(this, 'rpc'); var request = new Request(this, 'unl_add');
request.message.command = 'unl_add';
request.message.params = [addr, note]; request.message.params = [addr, note];
return request; return request;
}; };
Remote.prototype.request_unl_delete = function (publicKey) { Remote.prototype.request_unl_delete = function (publicKey) {
var request = new Request(this, 'rpc'); var request = new Request(this, 'unl_delete');
request.message.command = 'unl_delete';
request.message.params = [publicKey]; request.message.params = [publicKey];
return request; return request;
}; };
Remote.prototype.request_peers = function () { Remote.prototype.request_peers = function () {
var request = new Request(this, 'rpc'); return new Request(this, 'peers');
request.message.command = 'peers';
return request;
}; };
Remote.prototype.request_connect = function (ip, port) { Remote.prototype.request_connect = function (ip, port) {
var request = new Request(this, 'rpc'); var request = new Request(this, 'connect');
request.message.command = 'connect';
request.message.params = [ip, port]; request.message.params = [ip, port];
return request; return request;