BTCPrivate
/
bitcore
mirror of https://github.com/BTCPrivate/bitcore.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1010 from eordano/feature/toSatoshisNumber 

Allow satoshis to be a string on output creation
This commit is contained in:
Manuel Aráoz 2015-01-28 12:30:21 -03:00
parent 1f563893c7 614a228c79
commit c51b239b6a
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/transaction/output.js
View File

@ -43,6 +43,9 @@ Object.defineProperty(Output.prototype, 'satoshis', {
if (num instanceof BN) {
this._satoshisBN = num;
this._satoshis = num.toNumber();
} else if (_.isString(num)) {
this._satoshis = parseInt(num);
this._satoshisBN = BN.fromNumber(this._satoshis);
} else {
this._satoshisBN = BN.fromNumber(num);
this._satoshis = num;

5
test/transaction/transaction.js
View File

@ -49,6 +49,11 @@ describe('Transaction', function() {
object.outputs[0].satoshis.should.equal(testAmount - 10000);
});
it('can take a string argument as an amount', function() {
var stringTx = new Transaction().to('mrU9pEmAx26HcbKVrABvgL7AwA5fjNFoDc', '10000');
(stringTx._outputAmount).should.equal(10000);
});
it('returns the fee correctly', function() {
testTransaction.getFee().should.equal(10000);
});