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

fix formatting

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-08-22 14:44:40 -04:00
commit 35e9508b28
2 changed files with 66 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

14
js/models/core/Wallet.js
View file

@ -181,17 +181,17 @@ Wallet.prototype._getKeyMap = function(txp) {
if (Object.keys(keyMap).length !== txp._inputSigners[i].length) if (Object.keys(keyMap).length !== txp._inputSigners[i].length)
throw new Error('Signature does not match known copayers'); throw new Error('Signature does not match known copayers');
for(var j in keyMap) { for (var j in keyMap) {
keyMapAll[j] = keyMap[j]; keyMapAll[j] = keyMap[j];
} }
// From here -> only to check that all inputs have the same sigs // From here -> only to check that all inputs have the same sigs
var inSigArr = []; var inSigArr = [];
Object.keys(keyMap).forEach(function(k){ Object.keys(keyMap).forEach(function(k) {
inSigArr.push(keyMap[k]); inSigArr.push(keyMap[k]);
}); });
var inSig = JSON.stringify(inSigArr.sort()); var inSig = JSON.stringify(inSigArr.sort());
if (i === '0') { if (i === '0') {
inSig0 = inSig; inSig0 = inSig;
continue; continue;
} }
@ -548,8 +548,8 @@ Wallet.fromObj = function(o, storage, network, blockchain) {
opts.privateKey = PrivateKey.fromObj(o.privateKey); opts.privateKey = PrivateKey.fromObj(o.privateKey);
else else
opts.privateKey = new PrivateKey({ opts.privateKey = new PrivateKey({
networkName: opts.networkName networkName: opts.networkName
}); });
if (o.publicKeyRing) if (o.publicKeyRing)
opts.publicKeyRing = PublicKeyRing.fromObj(o.publicKeyRing); opts.publicKeyRing = PublicKeyRing.fromObj(o.publicKeyRing);
@ -725,7 +725,7 @@ Wallet.prototype.purgeTxProposals = function(deleteAll) {
this.store(); this.store();
var n = this.txProposals.length(); var n = this.txProposals.length();
return m-n; return m - n;
}; };
Wallet.prototype.reject = function(ntxid) { Wallet.prototype.reject = function(ntxid) {

115
test/test.Wallet.js
View file

@ -30,10 +30,10 @@ var config = {
var getNewEpk = function() { var getNewEpk = function() {
return new PrivateKey({ return new PrivateKey({
networkName: config.networkName, networkName: config.networkName,
}) })
.deriveBIP45Branch() .deriveBIP45Branch()
.extendedPublicKeyString(); .extendedPublicKeyString();
} }
var addCopayers = function(w) { var addCopayers = function(w) {
@ -48,7 +48,7 @@ describe('Wallet model', function() {
(function() { (function() {
new Wallet(config) new Wallet(config)
}).should. }).should.
throw(); throw();
}); });
it('should getNetworkName', function() { it('should getNetworkName', function() {
var w = cachedCreateW(); var w = cachedCreateW();
@ -273,7 +273,7 @@ describe('Wallet model', function() {
var w = cachedCreateW2(); var w = cachedCreateW2();
var l = w.getAddressesStr(); var l = w.getAddressesStr();
for (var i = 0; i < l.length; i++) for (var i = 0; i < l.length; i++)
w.addressIsOwn(l[i]).should.equal(true); w.addressIsOwn(l[i]).should.equal(true);
w.addressIsOwn(l[0], { w.addressIsOwn(l[0], {
excludeMain: true excludeMain: true
@ -322,14 +322,14 @@ describe('Wallet model', function() {
o.opts.reconnectDelay = 100; o.opts.reconnectDelay = 100;
var w2 = Wallet.fromObj(o, var w2 = Wallet.fromObj(o,
new Storage(config.storage), new Storage(config.storage),
new Network(config.network), new Network(config.network),
new Blockchain(config.blockchain)); new Blockchain(config.blockchain));
should.exist(w2); should.exist(w2);
w2.publicKeyRing.requiredCopayers.should.equal(w.publicKeyRing.requiredCopayers); w2.publicKeyRing.requiredCopayers.should.equal(w.publicKeyRing.requiredCopayers);
should.exist(w2.publicKeyRing.getCopayerId); should.exist(w2.publicKeyRing.getCopayerId);
should.exist(w2.txProposals.toObj); should.exist(w2.txProposals.toObj);
should.exist(w2.privateKey.toObj); should.exist(w2.privateKey.toObj);
}); });
it('#getSecret decodeSecret', function() { it('#getSecret decodeSecret', function() {
@ -346,15 +346,15 @@ describe('Wallet model', function() {
(function() { (function() {
Wallet.decodeSecret('4fp61K187CsYmjoRQC5iAdC5eGmbCRsAAXfwEwetSQgHvZs27eWKaLaNHRoKM'); Wallet.decodeSecret('4fp61K187CsYmjoRQC5iAdC5eGmbCRsAAXfwEwetSQgHvZs27eWKaLaNHRoKM');
}).should.not. }).should.not.
throw(); throw();
(function() { (function() {
Wallet.decodeSecret('4fp61K187CsYmjoRQC5iAdC5eGmbCRsAAXfwEwetSQgHvZs27eWKaLaNHRoK'); Wallet.decodeSecret('4fp61K187CsYmjoRQC5iAdC5eGmbCRsAAXfwEwetSQgHvZs27eWKaLaNHRoK');
}).should. }).should.
throw(); throw();
(function() { (function() {
Wallet.decodeSecret('12345'); Wallet.decodeSecret('12345');
}).should. }).should.
throw(); throw();
}); });
@ -509,9 +509,9 @@ describe('Wallet model', function() {
} }
}; };
var stub = sinon.stub(w.publicKeyRing,'copayersForPubkeys').returns( var stub = sinon.stub(w.publicKeyRing, 'copayersForPubkeys').returns({
{'027445ab3a935dce7aee1dadb0d103ed6147a0f83deb80474a04538b2c5bc4d509':'pepe'} '027445ab3a935dce7aee1dadb0d103ed6147a0f83deb80474a04538b2c5bc4d509': 'pepe'
); });
w._handleTxProposal('senderID', txp, true); w._handleTxProposal('senderID', txp, true);
Object.keys(w.txProposals.txps).length.should.equal(1); Object.keys(w.txProposals.txps).length.should.equal(1);
w.getTxProposals().length.should.equal(1); w.getTxProposals().length.should.equal(1);
@ -605,21 +605,21 @@ describe('Wallet model', function() {
}); });
var roundErrorChecks = [{ var roundErrorChecks = [{
unspent: [1.0001], unspent: [1.0001],
balance: 100010000 balance: 100010000
}, { }, {
unspent: [1.0002, 1.0003, 1.0004], unspent: [1.0002, 1.0003, 1.0004],
balance: 300090000 balance: 300090000
}, { }, {
unspent: [0.000002, 1.000003, 2.000004], unspent: [0.000002, 1.000003, 2.000004],
balance: 300000900 balance: 300000900
}, { }, {
unspent: [0.0001, 0.0003], unspent: [0.0001, 0.0003],
balance: 40000 balance: 40000
}, { }, {
unspent: [0.0001, 0.0003, 0.0001, 0.0001, 0.0001, 0.0001, 0.0001, 0.0002], unspent: [0.0001, 0.0003, 0.0001, 0.0001, 0.0001, 0.0001, 0.0001, 0.0002],
balance: 110000 balance: 110000
}, },
]; ];
var roundWallet = cachedCreateW2(); var roundWallet = cachedCreateW2();
@ -765,7 +765,7 @@ describe('Wallet model', function() {
}); });
}); });
describe('#createTxSync', function () { describe('#createTxSync', function() {
it('should fail if amount below min value', function() { it('should fail if amount below min value', function() {
var w = cachedCreateW2(); var w = cachedCreateW2();
var utxo = createUTXO(w); var utxo = createUTXO(w);
@ -872,9 +872,9 @@ describe('Wallet model', function() {
}); });
sinon.assert.callCount(updateIndex, 4); sinon.assert.callCount(updateIndex, 4);
sinon.assert.calledWith(updateIndex, w.publicKeyRing.indexes[0] ); sinon.assert.calledWith(updateIndex, w.publicKeyRing.indexes[0]);
sinon.assert.calledWith(updateIndex, w.publicKeyRing.indexes[1] ); sinon.assert.calledWith(updateIndex, w.publicKeyRing.indexes[1]);
sinon.assert.calledWith(updateIndex, w.publicKeyRing.indexes[2] ); sinon.assert.calledWith(updateIndex, w.publicKeyRing.indexes[2]);
w.updateIndex.restore(); w.updateIndex.restore();
done(); done();
}); });
@ -898,8 +898,8 @@ describe('Wallet model', function() {
index.receiveIndex.should.equal(9); index.receiveIndex.should.equal(9);
index.changeIndex.should.equal(9); index.changeIndex.should.equal(9);
indexDiscovery.callCount.should.equal(2); indexDiscovery.callCount.should.equal(2);
sinon.assert.calledWith(indexDiscovery, 1, true, 2, 20 ); sinon.assert.calledWith(indexDiscovery, 1, true, 2, 20);
sinon.assert.calledWith(indexDiscovery, 2, false, 2, 20 ); sinon.assert.calledWith(indexDiscovery, 2, false, 2, 20);
w.indexDiscovery.restore(); w.indexDiscovery.restore();
done(); done();
}); });
@ -957,7 +957,7 @@ describe('Wallet model', function() {
(function() { (function() {
w.setAddressBook(contacts[0].address, contacts[0].label); w.setAddressBook(contacts[0].address, contacts[0].label);
}).should. }).should.
throw(); throw();
}); });
it('should show/hide everywhere', function() { it('should show/hide everywhere', function() {
@ -1121,8 +1121,7 @@ describe('Wallet model', function() {
it('should throw if unmatched sigs', function() { it('should throw if unmatched sigs', function() {
var stub = sinon.stub(w.publicKeyRing, 'copayersForPubkeys', function() { var stub = sinon.stub(w.publicKeyRing, 'copayersForPubkeys', function() {
return { return {};
};
}); });
var txp = { var txp = {
_inputSigners: [ _inputSigners: [
@ -1138,13 +1137,12 @@ describe('Wallet model', function() {
it('should throw if unmatched sigs (case 2)', function() { it('should throw if unmatched sigs (case 2)', function() {
var stub = sinon.stub(w.publicKeyRing, 'copayersForPubkeys', function() { var stub = sinon.stub(w.publicKeyRing, 'copayersForPubkeys', function() {
return { return {};
};
}); });
var txp = { var txp = {
_inputSigners: [ _inputSigners: [
['234','321'], ['234', '321'],
['234','322'] ['234', '322']
], ],
inputChainPaths: ['/m/1'], inputChainPaths: ['/m/1'],
}; };
@ -1175,11 +1173,11 @@ describe('Wallet model', function() {
}); });
it('should throw if one inputs has missing sigs', function() { it('should throw if one inputs has missing sigs', function() {
var call=0; var call = 0;
var stub = sinon.stub(w.publicKeyRing, 'copayersForPubkeys', function() { var stub = sinon.stub(w.publicKeyRing, 'copayersForPubkeys', function() {
return call++ ? { return call++ ? {
'555': 'pepe', '555': 'pepe',
}: { } : {
'123': 'juan', '123': 'juan',
'234': 'pepe', '234': 'pepe',
}; };
@ -1199,12 +1197,12 @@ describe('Wallet model', function() {
it('should throw if one inputs has different sigs', function() { it('should throw if one inputs has different sigs', function() {
var call=0; var call = 0;
var stub = sinon.stub(w.publicKeyRing, 'copayersForPubkeys', function() { var stub = sinon.stub(w.publicKeyRing, 'copayersForPubkeys', function() {
return call++ ? { return call++ ? {
'555': 'pepe', '555': 'pepe',
'666': 'pedro', '666': 'pedro',
}: { } : {
'123': 'juan', '123': 'juan',
'234': 'pepe', '234': 'pepe',
}; };
@ -1224,12 +1222,12 @@ describe('Wallet model', function() {
it('should not throw if 2 inputs has different pubs, same copayers', function() { it('should not throw if 2 inputs has different pubs, same copayers', function() {
var call=0; var call = 0;
var stub = sinon.stub(w.publicKeyRing, 'copayersForPubkeys', function() { var stub = sinon.stub(w.publicKeyRing, 'copayersForPubkeys', function() {
return call++ ? { return call++ ? {
'555': 'pepe', '555': 'pepe',
'666': 'pedro', '666': 'pedro',
}: { } : {
'123': 'pedro', '123': 'pedro',
'234': 'pepe', '234': 'pepe',
}; };
@ -1241,8 +1239,13 @@ describe('Wallet model', function() {
], ],
inputChainPaths: ['/m/1'], inputChainPaths: ['/m/1'],
}; };
var gk = w._getKeyMap(txp); var gk = w._getKeyMap(txp);
gk.should.deep.equal({ '123': 'pedro', '234': 'pepe', '555': 'pepe', '666': 'pedro' }); gk.should.deep.equal({
'123': 'pedro',
'234': 'pepe',
'555': 'pepe',
'666': 'pedro'
});
stub.restore(); stub.restore();
}); });
}); });