anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1883 from matiu/bug/sentts

Browse source 
Bug/sentts
This commit is contained in:
Gustavo Maximiliano Cortez 2014-11-27 20:41:46 -03:00
commit d8a4a2ebad
2 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
js/models/Wallet.js
View file

@ -2632,6 +2632,7 @@ Wallet.prototype.getTransactionHistory = function(opts, cb) {
if (proposal) {
// TODO refactor
tx.comment = proposal.comment;
tx.sentTs = proposal.sentTs;
tx.merchant = proposal.merchant;
tx.peerActions = proposal.peerActions;
tx.merchant = proposal.merchant;

3
test/Wallet.js
View file

@ -903,12 +903,15 @@ describe('Wallet model', function() {
it('should broadcast a TX', function(done) {
var w = createW2(null, 1);
var utxo = createUTXO(w);
var now = Date.now();
var txp = w._createTxProposal(PP.outs[0].address, PP.outs[0].amountSatStr, 'hola', utxo);
var ntxid = w.txProposals.add(txp);
sinon.stub(w.blockchain, 'broadcast').yields(null, 1234);
w.issueTx(ntxid, function(err, txid, status) {
should.not.exist(err);
txp.getSent().should.be.above(now-1);
txp.sentTxid.should.be.equal(txid);
txid.should.equal(1234);
status.should.equal(Wallet.TX_BROADCASTED);
done();