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

refactor txProposal input signature handling

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-08-21 19:30:31 -04:00
commit 18ffaa172a
4 changed files with 49 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

18
test/test.TxProposal.js
View file

@ -189,7 +189,7 @@ describe('TxProposal', function() {
var txp = dummyProposal;
var tx = dummyProposal.builder.build();
var ret = TxProposal._verifySignatures(pubkeys, validScriptSig, tx.hashForSignature());
ret.should.deep.equal([0, 3]);
ret.should.deep.equal(['03197599f6e209cefef07da2fddc6fe47715a70162c531ffff8e611cef23dfb70d', '03a94351fecc4328bb683bf93a1aa67378374904eac5980c7966723a51897c56e3']);
});
it('#_infoFromRedeemScript', function() {
var info = TxProposal._infoFromRedeemScript(validScriptSig);
@ -202,7 +202,7 @@ describe('TxProposal', function() {
});
it('#_updateSignedBy', function() {
var txp = dummyProposal;
txp._inputSignatures.should.deep.equal([
txp._inputSigners.should.deep.equal([
['03197599f6e209cefef07da2fddc6fe47715a70162c531ffff8e611cef23dfb70d', '03a94351fecc4328bb683bf93a1aa67378374904eac5980c7966723a51897c56e3']
]);
});
@ -302,7 +302,7 @@ describe('TxProposal', function() {
txp.signedBy = {
'hugo': 1
};
txp._inputSignatures = [
txp._inputSigners = [
['pkX']
];
(function() {
@ -319,7 +319,7 @@ describe('TxProposal', function() {
txp.signedBy = {
creator: 1
};
txp._inputSignatures = [
txp._inputSigners = [
['pk0', 'pkX']
];
(function() {
@ -333,7 +333,7 @@ describe('TxProposal', function() {
it.skip("should be signed by sender", function() {
var txp = dummyProposal;
var ts = Date.now();
txp._inputSignatures = [
txp._inputSigners = [
['pk1', 'pk0']
];
txp.signedBy = {
@ -352,7 +352,7 @@ describe('TxProposal', function() {
it("should set signedBy (trivial case)", function() {
var txp = dummyProposal;
var ts = Date.now();
txp._inputSignatures = [
txp._inputSigners = [
['pk1', 'pk0']
];
txp.signedBy = {
@ -370,7 +370,7 @@ describe('TxProposal', function() {
it("should assign creator", function() {
var txp = dummyProposal;
var ts = Date.now();
txp._inputSignatures = [
txp._inputSigners = [
['pk0']
];
txp.signedBy = {};
@ -392,7 +392,7 @@ describe('TxProposal', function() {
txp.signedBy = {};
delete txp['creator'];
delete txp['creatorTs'];
txp._inputSignatures = [
txp._inputSigners = [
['pk0', 'pk1']
];
(function() {
@ -411,7 +411,7 @@ describe('TxProposal', function() {
it("if signed, should not change ts", function() {
var txp = dummyProposal;
var ts = Date.now();
txp._inputSignatures = [
txp._inputSigners = [
['pk0', 'pk1']
];
txp.creator = 'creator';

10
test/test.Wallet.js
View file

@ -219,7 +219,7 @@ describe('Wallet model', function() {
var t = w.txProposals;
var txp = t.txps[ntxid];
Object.keys(txp._inputSignatures).length.should.equal(1);
Object.keys(txp._inputSigners).length.should.equal(1);
var tx = txp.builder.build();
should.exist(tx);
chai.expect(txp.comment).to.be.null;
@ -1108,7 +1108,7 @@ describe('Wallet model', function() {
};
});
var txp = {
_inputSignatures: [
_inputSigners: [
['123']
],
inputChainPaths: ['/m/1'],
@ -1126,7 +1126,7 @@ describe('Wallet model', function() {
};
});
var txp = {
_inputSignatures: [
_inputSigners: [
['234']
],
inputChainPaths: ['/m/1'],
@ -1145,7 +1145,7 @@ describe('Wallet model', function() {
};
});
var txp = {
_inputSignatures: [
_inputSigners: [
['234', '123']
],
inputChainPaths: ['/m/1'],
@ -1165,7 +1165,7 @@ describe('Wallet model', function() {
};
});
var txp = {
_inputSignatures: [
_inputSigners: [
['234', '123'],
['234']
],