Move files to /model

This commit is contained in:
Matias Pando 2014-09-23 15:24:57 -03:00
commit 06c83a8aba
24 changed files with 133 additions and 130 deletions

View file

@ -8,7 +8,7 @@ try {
} catch (e) {
var copay = require('../copay'); //node
}
var HDPath = require('../js/models/core/HDPath');
var HDPath = require('../js/models/HDPath');
describe('HDPath model', function() {
it('should have the correct constants', function() {
@ -40,33 +40,33 @@ describe('HDPath model', function() {
[
['m/45\'/0/0/0', {
index: 0,
isChange: false
}],
['m/45\'/0/0/1', {
index: 1,
isChange: false
}],
['m/45\'/0/0/2', {
index: 2,
isChange: false
}],
['m/45\'/0/1/0', {
index: 0,
isChange: true
}],
['m/45\'/0/1/1', {
index: 1,
isChange: true
}],
['m/45\'/0/1/2', {
index: 2,
isChange: true
}],
['m/45\'/0/0/900', {
index: 900,
isChange: false
}],
index: 0,
isChange: false
}],
['m/45\'/0/0/1', {
index: 1,
isChange: false
}],
['m/45\'/0/0/2', {
index: 2,
isChange: false
}],
['m/45\'/0/1/0', {
index: 0,
isChange: true
}],
['m/45\'/0/1/1', {
index: 1,
isChange: true
}],
['m/45\'/0/1/2', {
index: 2,
isChange: true
}],
['m/45\'/0/0/900', {
index: 900,
isChange: false
}],
].forEach(function(datum) {
var path = datum[0];
var result = datum[1];

View file

@ -16,7 +16,7 @@ try {
} catch (e) {
var copay = require('../copay'); //node
}
var PrivateKey = copay.PrivateKey || require('../js/models/core/PrivateKey');
var PrivateKey = copay.PrivateKey || require('../js/models/PrivateKey');
var pkConfig = {
networkName: 'livenet',
@ -33,7 +33,7 @@ describe('PrivateKey model', function() {
it('should derive priv keys', function() {
var pk = new PrivateKey(pkConfig);
for (var j = false; !j; j=true) {
for (var j = false; !j; j = true) {
for (var i = 0; i < 3; i++) {
var wk = pk.get(i, j);
should.exist(wk);

View file

@ -6,7 +6,7 @@ var bitcore = bitcore || require('bitcore');
var Address = bitcore.Address;
var buffertools = bitcore.buffertools;
var HDPath = require('../js/models/core/HDPath');
var HDPath = require('../js/models/HDPath');
try {
var copay = require('copay'); //browser
@ -21,10 +21,10 @@ var aMasterPubKey = 'tprv8ZgxMBicQKsPdSVTiWXEqCCzqRaRr9EAQdn5UVMpT9UHX67Dh1FmzEM
var getNewEpk = function() {
return new PrivateKey({
networkName: 'livenet',
})
.deriveBIP45Branch()
.extendedPublicKeyString();
networkName: 'livenet',
})
.deriveBIP45Branch()
.extendedPublicKeyString();
}
var createW = function(networkName) {
@ -53,7 +53,7 @@ var createW = function(networkName) {
};
var cachedW;
var getCachedW = function() {
var getCachedW = function() {
if (!cachedW) {
cachedW = createW();
}
@ -152,7 +152,7 @@ describe('PublicKeyRing model', function() {
a.network().name.should.equal('livenet');
if (i > 1) {
w.getAddress(i - 1, isChange).toString().should
.not.equal(w.getAddress(i - 2, isChange).toString());
.not.equal(w.getAddress(i - 2, isChange).toString());
}
}
});
@ -193,9 +193,9 @@ describe('PublicKeyRing model', function() {
var w = k.w;
for (var i = 0; i < 3; i++)
w.generateAddress(true, k.pub);
w.generateAddress(true, k.pub);
for (var i = 0; i < 2; i++)
w.generateAddress(false, k.pub);
w.generateAddress(false, k.pub);
w.getHDParams(k.pub).getChangeIndex().should.equal(3);
w.getHDParams(k.pub).getReceiveIndex().should.equal(2);
@ -258,9 +258,9 @@ describe('PublicKeyRing model', function() {
var w = k.w;
for (var i = 0; i < 2; i++)
w.generateAddress(true, k.pub);
w.generateAddress(true, k.pub);
for (var i = 0; i < 3; i++)
w.generateAddress(false, k.pub);
w.generateAddress(false, k.pub);
var w2 = new PublicKeyRing({
networkName: 'livenet',
@ -327,7 +327,7 @@ describe('PublicKeyRing model', function() {
});
for (var i = 0; i < 5; i++)
w0.addCopayer(getNewEpk());
w0.addCopayer(getNewEpk());
(function() {
w0.merge(w);
@ -441,11 +441,9 @@ describe('PublicKeyRing model', function() {
};
var pkr = new PublicKeyRing(config);
(function ()
{
(function() {
PublicKeyRing.fromObj(pkr);
}
).should.throw('bad data format: Did you use .toObj()?');
}).should.throw('bad data format: Did you use .toObj()?');
});
@ -499,9 +497,9 @@ describe('PublicKeyRing model', function() {
var amount = 2;
for (var i = 0; i < amount; i++)
w.generateAddress(true, k.pub);
w.generateAddress(true, k.pub);
for (var i = 0; i < amount; i++)
w.generateAddress(false, k.pub);
w.generateAddress(false, k.pub);
var m = w.getRedeemScriptMap([
'm/45\'/2147483647/1/0',

View file

@ -10,18 +10,18 @@ var sinon = require('sinon');
var FakeNetwork = require('./mocks/FakeNetwork');
var FakeBlockchain = require('./mocks/FakeBlockchain');
var FakeStorage = function FakeStorage() {};
var WalletFactory = require('../js/models/core/WalletFactory');
var Passphrase = require('../js/models/core/Passphrase');
var WalletFactory = require('../js/models/WalletFactory');
var Passphrase = require('../js/models/Passphrase');
var mockLocalStorage = require('./mocks/FakeLocalStorage');
var mockSessionStorage = require('./mocks/FakeLocalStorage');
var PERSISTED_PROPERTIES = (copay.Wallet || require('../js/models/core/Wallet')).PERSISTED_PROPERTIES;
var PERSISTED_PROPERTIES = (copay.Wallet || require('../js/models/Wallet')).PERSISTED_PROPERTIES;
function assertObjectEqual(a, b) {
PERSISTED_PROPERTIES.forEach(function(k) {
if (a[k] && b[k]) {
_.omit(a[k],'name').should.be.deep.equal(b[k], k + ' differs');
_.omit(a[k], 'name').should.be.deep.equal(b[k], k + ' differs');
}
})
}

View file

@ -2,15 +2,15 @@
var chai = chai || require('chai');
var should = chai.should();
var PrivateKey = require('../js/models/core/PrivateKey');
var PublicKeyRing = require('../js/models/core/PublicKeyRing');
var PrivateKey = require('../js/models/PrivateKey');
var PublicKeyRing = require('../js/models/PublicKeyRing');
var getNewEpk = function() {
return new PrivateKey({
networkName: 'livenet',
})
.deriveBIP45Branch()
.extendedPublicKeyString();
networkName: 'livenet',
})
.deriveBIP45Branch()
.extendedPublicKeyString();
}