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

PublicKeyRing handles one index for each cosigner

Browse source
This commit is contained in:
Yemel Jardi 2014-07-03 11:18:01 -03:00
commit 04b6aa4003
7 changed files with 140 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

39
test/test.PublicKeyRing.js
View file

@ -36,7 +36,8 @@ var createW = function(networkName) {
return {
w: w,
copayers: copayers
copayers: copayers,
pub: w.copayersHK[0].eckey.public.toString('hex')
};
};
@ -88,7 +89,7 @@ describe('PublicKeyRing model', function() {
}
});
it('show be able to to store and read', function() {
it('should be able to to store and read', function() {
var k = createW();
var w = k.w;
var copayers = k.copayers;
@ -96,10 +97,10 @@ describe('PublicKeyRing model', function() {
var addressN = 2;
var start = new Date().getTime();
for (var i = 0; i < changeN; i++) {
w.generateAddress(true);
w.generateAddress(true, k.pub);
}
for (var i = 0; i < addressN; i++) {
w.generateAddress(false);
w.generateAddress(false, k.pub);
}
var data = w.toObj();
@ -115,8 +116,8 @@ describe('PublicKeyRing model', function() {
}).should.throw();
}
w2.getSharedIndex().getChangeIndex().should.equal(changeN);
w2.getSharedIndex().getReceiveIndex().should.equal(addressN);
w2.getIndex(k.pub).getChangeIndex().should.equal(changeN);
w2.getIndex(k.pub).getReceiveIndex().should.equal(addressN);
});
@ -126,7 +127,7 @@ describe('PublicKeyRing model', function() {
[true, false].forEach(function(isChange){
for (var i = 0; i < 2; i++) {
var a = w.generateAddress(isChange);
var a = w.generateAddress(isChange, k.pub);
a.isValid().should.equal(true);
a.isScript().should.equal(true);
a.network().name.should.equal('livenet');
@ -148,7 +149,7 @@ describe('PublicKeyRing model', function() {
[true, false].forEach(function(isChange){
for (var i = 0; i < 2; i++) {
w.generateAddress(isChange);
w.generateAddress(isChange, k.pub);
}
});
@ -167,12 +168,12 @@ describe('PublicKeyRing model', function() {
var w = k.w;
for (var i = 0; i < 3; i++)
w.generateAddress(true);
w.generateAddress(true, k.pub);
for (var i = 0; i < 2; i++)
w.generateAddress(false);
w.generateAddress(false, k.pub);
w.getSharedIndex().getChangeIndex().should.equal(3);
w.getSharedIndex().getReceiveIndex().should.equal(2);
w.getIndex(k.pub).getChangeIndex().should.equal(3);
w.getIndex(k.pub).getReceiveIndex().should.equal(2);
});
it('#merge index tests', function() {
@ -180,9 +181,9 @@ describe('PublicKeyRing model', function() {
var w = k.w;
for (var i = 0; i < 2; i++)
w.generateAddress(true);
w.generateAddress(true, k.pub);
for (var i = 0; i < 3; i++)
w.generateAddress(false);
w.generateAddress(false, k.pub);
var w2 = new PublicKeyRing({
networkName: 'livenet',
@ -191,8 +192,8 @@ describe('PublicKeyRing model', function() {
w2.merge(w).should.equal(true);
w2.requiredCopayers.should.equal(3);
w2.totalCopayers.should.equal(5);
w2.getSharedIndex().getChangeIndex().should.equal(2);
w2.getSharedIndex().getReceiveIndex().should.equal(3);
w2.getIndex(k.pub).getChangeIndex().should.equal(2);
w2.getIndex(k.pub).getReceiveIndex().should.equal(3);
//
w2.merge(w).should.equal(false);
@ -391,8 +392,6 @@ describe('PublicKeyRing model', function() {
var i = p.getIndex(Structure.SHARED_INDEX);
should.exist(i);
i.cosigner.should.equal(Structure.SHARED_INDEX);
var shared = p.getSharedIndex();
shared.should.equal(i);
});
it('#getIndex should throw error', function() {
@ -412,9 +411,9 @@ describe('PublicKeyRing model', function() {
var amount = 2;
for (var i = 0; i < amount; i++)
w.generateAddress(true);
w.generateAddress(true, k.pub);
for (var i = 0; i < amount; i++)
w.generateAddress(false);
w.generateAddress(false, k.pub);
var m = w.getRedeemScriptMap([
'm/45\'/2147483647/1/0',