Revert "Revert "paypro: prepare for txp refactor. will stay reverted until #1001 is merged.""

This reverts commit 6fcd27b3ea0f7aa1ef7985560ca917393510c65e.
This commit is contained in:
Christopher Jeffrey 2014-08-06 17:17:01 -07:00 committed by Manuel Araoz
commit 17f3402dab
3 changed files with 16 additions and 19 deletions

View file

@ -869,7 +869,7 @@ describe('PayPro (in Wallet) model', function() {
merchantData.raw = pr.serialize().toString('hex');
var myId = w.getMyCopayerId();
var txp = w.txProposals.txps[ntxid];
var txp = w.txProposals.get(ntxid);
should.exist(txp);
should.exist(txp.signedBy[myId]);
should.not.exist(txp.rejectedBy[myId]);
@ -896,7 +896,7 @@ describe('PayPro (in Wallet) model', function() {
amount.low = 2;
var myId = w.getMyCopayerId();
var txp = w.txProposals.txps[ntxid];
var txp = w.txProposals.get(ntxid);
should.exist(txp);
should.exist(txp.signedBy[myId]);
should.not.exist(txp.rejectedBy[myId]);
@ -917,12 +917,12 @@ describe('PayPro (in Wallet) model', function() {
should.exist(merchantData);
// Tamper with payment request in its abstract form:
var txp = w.txProposals.txps[ntxid];
var txp = w.txProposals.get(ntxid);
var tx = txp.builder.tx || txp.builder.build();
tx.outs[0].v = new Buffer([2, 0, 0, 0, 0, 0, 0, 0]);
var myId = w.getMyCopayerId();
var txp = w.txProposals.txps[ntxid];
var txp = w.txProposals.get(ntxid);
should.exist(txp);
should.exist(txp.signedBy[myId]);
should.not.exist(txp.rejectedBy[myId]);
@ -943,7 +943,7 @@ describe('PayPro (in Wallet) model', function() {
should.exist(merchantData);
var myId = w.getMyCopayerId();
var txp = w.txProposals.txps[ntxid];
var txp = w.txProposals.get(ntxid);
should.exist(txp);
should.exist(txp.signedBy[myId]);
should.not.exist(txp.rejectedBy[myId]);