run js-beautify on everything

...with two spaces. Command: js-beautify -s 2 -r [filename]
This commit is contained in:
Ryan X. Charles 2014-06-24 08:36:32 -07:00
commit ea2e2d4e19
49 changed files with 859 additions and 682 deletions

View file

@ -1,21 +1,21 @@
'use strict';
var chai = chai || require('chai');
var should = chai.should();
var bitcore = bitcore || require('bitcore');
var Address = bitcore.Address;
var buffertools = bitcore.buffertools;
var chai = chai || require('chai');
var should = chai.should();
var bitcore = bitcore || require('bitcore');
var Address = bitcore.Address;
var buffertools = bitcore.buffertools;
try {
var copay = require('copay'); //browser
} catch (e) {
var copay = require('../copay'); //node
}
var PublicKeyRing = copay.PublicKeyRing;
var PublicKeyRing = copay.PublicKeyRing;
var aMasterPubKey = 'tprv8ZgxMBicQKsPdSVTiWXEqCCzqRaRr9EAQdn5UVMpT9UHX67Dh1FmzEMbavPumpAicsUm2XvC6NTdcWB89yN5DUWx5HQ7z3KByUg7Ht74VRZ';
var createW = function (networkName) {
var createW = function(networkName) {
var config = {
networkName: networkName || 'livenet',
};
@ -24,21 +24,24 @@ var createW = function (networkName) {
should.exist(w);
var copayers = [];
for(var i=0; i<5; i++) {
for (var i = 0; i < 5; i++) {
w.isComplete().should.equal(false);
var newEpk = w.addCopayer();
copayers.push(newEpk);
}
w.walletId = '1234567';
return {w:w, copayers: copayers};
return {
w: w,
copayers: copayers
};
};
describe('PublicKeyRing model', function() {
it('should create an instance (livenet)', function () {
it('should create an instance (livenet)', function() {
var config = {
networkName:'livenet',
networkName: 'livenet',
};
var w = new PublicKeyRing({
@ -47,48 +50,52 @@ describe('PublicKeyRing model', function() {
should.exist(w);
w.network.name.should.equal('livenet');
});
it('should create an instance (testnet)', function () {
it('should create an instance (testnet)', function() {
var w2 = new PublicKeyRing();
should.exist(w2);
w2.network.name.should.equal('testnet');
});
it('should fail to generate shared pub keys wo extended key', function () {
it('should fail to generate shared pub keys wo extended key', function() {
var config = {
networkName:'livenet',
networkName: 'livenet',
};
var w2 = new PublicKeyRing(config);
should.exist(w2);
w2.registeredCopayers().should.equal(0);
w2.registeredCopayers().should.equal(0);
w2.isComplete().should.equal(false);
(function() {w2.getAddress(0, false);}).should.throw();
(function() {
w2.getAddress(0, false);
}).should.throw();
});
it('should add and check when adding shared pub keys', function () {
it('should add and check when adding shared pub keys', function() {
var k = createW();
var w = k.w;
var copayers = k.copayers;
w.isComplete().should.equal(true);
w.addCopayer.should.throw();
for(var i =0; i<5; i++) {
(function() {w.addCopayer(copayers[i])}).should.throw();
for (var i = 0; i < 5; i++) {
(function() {
w.addCopayer(copayers[i])
}).should.throw();
}
});
it('show be able to tostore and read', function () {
it('show be able to tostore and read', function() {
var k = createW();
var w = k.w;
var copayers = k.copayers;
var changeN = 2;
var addressN = 2;
var start = new Date().getTime();
for(var i=0; i<changeN; i++) {
for (var i = 0; i < changeN; i++) {
w.generateAddress(true);
}
for(var i=0; i<addressN; i++) {
for (var i = 0; i < addressN; i++) {
w.generateAddress(false);
}
@ -99,34 +106,36 @@ describe('PublicKeyRing model', function() {
w2.walletId.should.equal(w.walletId);
w2.isComplete().should.equal(true);
w2.addCopayer.should.throw();
for(var i =0; i<5; i++) {
(function() {w.addCopayer(copayers[i])}).should.throw();
for (var i = 0; i < 5; i++) {
(function() {
w.addCopayer(copayers[i])
}).should.throw();
}
w2.indexes.getChangeIndex().should.equal(changeN);
w2.indexes.getReceiveIndex().should.equal(addressN);
w2.indexes.getChangeIndex().should.equal(changeN);
w2.indexes.getReceiveIndex().should.equal(addressN);
});
it('should generate some p2sh addresses', function () {
it('should generate some p2sh addresses', function() {
var k = createW();
var w = k.w;
for(var isChange=0; isChange<2; isChange++) {
for(var i=0; i<2; i++) {
for (var isChange = 0; isChange < 2; isChange++) {
for (var i = 0; i < 2; i++) {
var a = w.generateAddress(isChange);
a.isValid().should.equal(true);
a.isScript().should.equal(true);
a.network().name.should.equal('livenet');
if (i>1) {
w.getAddress(i-1,isChange).toString().should
.not.equal(w.getAddress(i-2,isChange).toString());
if (i > 1) {
w.getAddress(i - 1, isChange).toString().should
.not.equal(w.getAddress(i - 2, isChange).toString());
}
}
}
});
it('should return PublicKeyRing addresses', function () {
it('should return PublicKeyRing addresses', function() {
var k = createW();
var w = k.w;
@ -134,38 +143,38 @@ describe('PublicKeyRing model', function() {
var a = w.getAddresses();
a.length.should.equal(0);
for(var isChange=0; isChange<2; isChange++)
for(var i=0; i<2; i++)
w.generateAddress(isChange);
for (var isChange = 0; isChange < 2; isChange++)
for (var i = 0; i < 2; i++)
w.generateAddress(isChange);
var as = w.getAddresses();
as.length.should.equal(4);
for(var j in as) {
for (var j in as) {
var a = as[j];
a.isValid().should.equal(true);
}
});
it('should count generation indexes', function () {
it('should count generation indexes', function() {
var k = createW();
var w = k.w;
for(var i=0; i<3; i++)
for (var i = 0; i < 3; i++)
w.generateAddress(true);
for(var i=0; i<2; i++)
for (var i = 0; i < 2; i++)
w.generateAddress(false);
w.indexes.getChangeIndex().should.equal(3);
w.indexes.getReceiveIndex().should.equal(2);
w.indexes.getChangeIndex().should.equal(3);
w.indexes.getReceiveIndex().should.equal(2);
});
it('#merge index tests', function () {
it('#merge index tests', function() {
var k = createW();
var w = k.w;
for(var i=0; i<2; i++)
for (var i = 0; i < 2; i++)
w.generateAddress(true);
for(var i=0; i<3; i++)
for (var i = 0; i < 3; i++)
w.generateAddress(false);
var w2 = new PublicKeyRing({
@ -173,17 +182,17 @@ describe('PublicKeyRing model', function() {
walletId: w.walletId,
});
w2.merge(w).should.equal(true);
w2.requiredCopayers.should.equal(3);
w2.totalCopayers.should.equal(5);
w2.indexes.getChangeIndex().should.equal(2);
w2.indexes.getReceiveIndex().should.equal(3);
w2.requiredCopayers.should.equal(3);
w2.totalCopayers.should.equal(5);
w2.indexes.getChangeIndex().should.equal(2);
w2.indexes.getReceiveIndex().should.equal(3);
//
w2.merge(w).should.equal(false);
});
it('#merge check tests', function () {
it('#merge check tests', function() {
var config = {
networkName: 'livenet',
};
@ -191,32 +200,42 @@ describe('PublicKeyRing model', function() {
var w = new PublicKeyRing(config);
w.walletId = 'lwjd5qra8257b9';
var w2 = new PublicKeyRing({
networkName: 'testnet', //wrong
networkName: 'testnet', //wrong
walletId: w.walletId,
});
(function() { w2.merge(w);}).should.throw();
(function() {
w2.merge(w);
}).should.throw();
var w3 = new PublicKeyRing({
networkName: 'livenet',
walletId: w.walletId,
requiredCopayers: 2, // wrong
requiredCopayers: 2, // wrong
});
(function() { w3.merge(w);}).should.throw();
(function() {
w3.merge(w);
}).should.throw();
var w4 = new PublicKeyRing({
networkName: 'livenet',
walletId: w.walletId,
totalCopayers: 3, // wrong
totalCopayers: 3, // wrong
});
(function() { w4.merge(w);}).should.throw();
(function() {
w4.merge(w);
}).should.throw();
var w6 = new PublicKeyRing({
networkName: 'livenet',
});
(function() { w6.merge(w);}).should.throw();
w.networkName= 'livenet';
(function() { w6.merge(w);}).should.throw();
(function() {
w6.merge(w);
}).should.throw();
w.networkName = 'livenet';
(function() {
w6.merge(w);
}).should.throw();
var w0 = new PublicKeyRing({
@ -227,28 +246,32 @@ describe('PublicKeyRing model', function() {
w0.addCopayer();
w0.addCopayer();
w0.addCopayer();
(function() { w0.merge(w);}).should.throw();
w.merge(w0,true).should.equal(true);
(function() {
w0.merge(w);
}).should.throw();
w.merge(w0, true).should.equal(true);
w.isComplete().should.equal(true);
var wx = new PublicKeyRing({
networkName: 'livenet',
});
wx.addCopayer();
(function() { w.merge(wx);}).should.throw();
(function() {
w.merge(wx);
}).should.throw();
});
it('#merge pubkey tests', function () {
it('#merge pubkey tests', function() {
var config = {
networkName:'livenet',
networkName: 'livenet',
};
var w = new PublicKeyRing(config);
should.exist(w);
var copayers = [];
for(var i=0; i<2; i++) {
for (var i = 0; i < 2; i++) {
w.isComplete().should.equal(false);
w.addCopayer();
}
@ -259,7 +282,7 @@ describe('PublicKeyRing model', function() {
});
should.exist(w);
var copayers = [];
for(var i=0; i<3; i++) {
for (var i = 0; i < 3; i++) {
w2.isComplete().should.equal(false);
w2.addCopayer();
}
@ -273,14 +296,14 @@ describe('PublicKeyRing model', function() {
w.merge(w2).should.equal(false);
});
it('#merge pubkey tests (case 2)', function () {
it('#merge pubkey tests (case 2)', function() {
var config = {
networkName:'livenet',
networkName: 'livenet',
};
var w = new PublicKeyRing(config);
should.exist(w);
for(var i=0; i<5; i++) {
for (var i = 0; i < 5; i++) {
w.isComplete().should.equal(false);
var w2 = new PublicKeyRing({
networkName: 'livenet',
@ -293,31 +316,31 @@ describe('PublicKeyRing model', function() {
});
it('#merge with nickname', function () {
it('#merge with nickname', function() {
var config = {
networkName:'livenet',
networkName: 'livenet',
};
var w = new PublicKeyRing(config);
should.exist(w);
for(var i=0; i<3; i++) {
for (var i = 0; i < 3; i++) {
w.addCopayer();
};
w._setNicknameForIndex(0,'pepe0');
w._setNicknameForIndex(1,'pepe1');
w._setNicknameForIndex(0, 'pepe0');
w._setNicknameForIndex(1, 'pepe1');
w.nicknameForIndex(0).should.equal('pepe0');
w.nicknameForIndex(1).should.equal('pepe1');
should.not.exist(w.nicknameForIndex(2));
for(var i=0; i<2; i++) {
for (var i = 0; i < 2; i++) {
w.isComplete().should.equal(false);
var w2 = new PublicKeyRing({
networkName: 'livenet',
id: w.id,
});
w2.addCopayer();
w2._setNicknameForIndex(0,'juan' + i);
w2._setNicknameForIndex(0, 'juan' + i);
w.merge(w2).should.equal(true);
}
w.isComplete().should.equal(true);
@ -330,14 +353,14 @@ describe('PublicKeyRing model', function() {
});
it('#toObj #fromObj with nickname', function () {
it('#toObj #fromObj with nickname', function() {
var config = {
networkName:'livenet',
networkName: 'livenet',
};
var w = new PublicKeyRing(config);
should.exist(w);
for(var i=0; i<3; i++) {
w.addCopayer(null, 'tito'+i);
for (var i = 0; i < 3; i++) {
w.addCopayer(null, 'tito' + i);
};
w.nicknameForIndex(0).should.equal('tito0');
w.nicknameForIndex(1).should.equal('tito1');
@ -345,7 +368,7 @@ describe('PublicKeyRing model', function() {
should.not.exist(w.nicknameForIndex(3));
var o = JSON.parse(JSON.stringify(w.toObj()));
var w2 = PublicKeyRing.fromObj( o );
var w2 = PublicKeyRing.fromObj(o);
w2.nicknameForIndex(0).should.equal('tito0');
w2.nicknameForIndex(1).should.equal('tito1');
w2.nicknameForIndex(2).should.equal('tito2');
@ -353,22 +376,20 @@ describe('PublicKeyRing model', function() {
});
it('#getRedeemScriptMap check tests', function () {
it('#getRedeemScriptMap check tests', function() {
var k = createW();
var w = k.w;
for(var i=0; i<2; i++)
for (var i = 0; i < 2; i++)
w.generateAddress(true);
for(var i=0; i<2; i++)
for (var i = 0; i < 2; i++)
w.generateAddress(false);
var m = w.getRedeemScriptMap();
Object.keys(m).length.should.equal(4);
Object.keys(m).forEach(function (k) {
Object.keys(m).forEach(function(k) {
should.exist(m[k]);
});
});
});