RanchiMall/fcoin
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

http: send details after send.

Browse Source
This commit is contained in:
Christopher Jeffrey 2016-10-19 15:33:43 -07:00
parent de690e4f22
commit 9049053a1e
No known key found for this signature in database
GPG Key ID: 8962AB9DE6666BBD
3 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/http/server.js
View File

@ -839,7 +839,8 @@ HTTPServer.prototype._init = function _init() {
var options = req.options; var options = req.options;
var passphrase = options.passphrase; var passphrase = options.passphrase;
var tx = yield req.wallet.send(options, passphrase); var tx = yield req.wallet.send(options, passphrase);
send(200, tx.toJSON()); var details = yield req.wallet.toDetails(tx);
send(200, details.toJSON());
})); }));
// Create TX // Create TX

7
lib/wallet/txdb.js
View File

@ -2168,10 +2168,11 @@ TXDB.prototype.getAccountCredits = co(function* getAccountCredits(account, all)
*/ */
TXDB.prototype.fillHistory = co(function* fillHistory(tx) { TXDB.prototype.fillHistory = co(function* fillHistory(tx) {
var coins = [];
var i, input, credits, credit; var i, input, credits, credit;
if (tx.isCoinbase()) if (tx.isCoinbase())
return tx; return coins;
credits = yield this.getSpentCredits(tx); credits = yield this.getSpentCredits(tx);
@ -2183,9 +2184,11 @@ TXDB.prototype.fillHistory = co(function* fillHistory(tx) {
continue; continue;
input.coin = credit.coin; input.coin = credit.coin;
coins.push(credit.coin);
} }
return tx; return coins;
}); });
/** /**

17
test/http-test.js
View File

@ -110,7 +110,6 @@ describe('HTTP', function() {
assert(balance); assert(balance);
assert.equal(utils.satoshi(balance.confirmed), 0); assert.equal(utils.satoshi(balance.confirmed), 0);
assert.equal(utils.satoshi(balance.unconfirmed), 201840); assert.equal(utils.satoshi(balance.unconfirmed), 201840);
assert.equal(utils.satoshi(balance.total), 201840);
assert(details); assert(details);
assert.equal(details.hash, t1.rhash); assert.equal(details.hash, t1.rhash);
})); }));
@ -119,11 +118,13 @@ describe('HTTP', function() {
var balance = yield wallet.getBalance(); var balance = yield wallet.getBalance();
assert.equal(utils.satoshi(balance.confirmed), 0); assert.equal(utils.satoshi(balance.confirmed), 0);
assert.equal(utils.satoshi(balance.unconfirmed), 201840); assert.equal(utils.satoshi(balance.unconfirmed), 201840);
assert.equal(utils.satoshi(balance.total), 201840);
})); }));
it('should send a tx', cob(function* () { it('should send a tx', cob(function* () {
var options = { var value = 0;
var options, tx;
options = {
rate: 10000, rate: 10000,
outputs: [{ outputs: [{
value: 10000, value: 10000,
@ -131,12 +132,16 @@ describe('HTTP', function() {
}] }]
}; };
var tx = yield wallet.send(options); tx = yield wallet.send(options);
assert(tx); assert(tx);
assert.equal(tx.inputs.length, 1); assert.equal(tx.inputs.length, 1);
assert.equal(tx.outputs.length, 2); assert.equal(tx.outputs.length, 2);
assert.equal(utils.satoshi(tx.outputs[0].value) + utils.satoshi(tx.outputs[1].value), 48190);
value += utils.satoshi(tx.outputs[0].value);
value += utils.satoshi(tx.outputs[1].value);
assert.equal(value, 48190);
hash = tx.hash; hash = tx.hash;
})); }));
@ -155,7 +160,7 @@ describe('HTTP', function() {
it('should get balance', cob(function* () { it('should get balance', cob(function* () {
var balance = yield wallet.getBalance(); var balance = yield wallet.getBalance();
assert.equal(utils.satoshi(balance.total), 199570); assert.equal(utils.satoshi(balance.unconfirmed), 199570);
})); }));
it('should execute an rpc call', cob(function* () { it('should execute an rpc call', cob(function* () {