rm cache from storage/network from Priv Key

This commit is contained in:
Matias Alejo Garcia 2014-08-19 13:31:35 -04:00
commit 9e5bec9b9b
3 changed files with 18 additions and 10 deletions

View file

@ -13,8 +13,8 @@ function PrivateKey(opts) {
this.network = opts.networkName === 'testnet' ? this.network = opts.networkName === 'testnet' ?
networks.testnet : networks.livenet; networks.testnet : networks.livenet;
var init = opts.extendedPrivateKeyString || this.network.name; var init = opts.extendedPrivateKeyString || this.network.name;
this.bip = opts.HK || new HK(init); this.bip = new HK(init);
this.privateKeyCache = opts.privateKeyCache || {}; this.privateKeyCache = {};
this.publicHex = this.deriveBIP45Branch().eckey.public.toString('hex'); this.publicHex = this.deriveBIP45Branch().eckey.public.toString('hex');
}; };
@ -54,15 +54,24 @@ PrivateKey.prototype.deriveBIP45Branch = function() {
return this.bip45Branch; return this.bip45Branch;
} }
PrivateKey.trim = function(data) {
var opts = {};
['networkName', 'extendedPrivateKeyString'].forEach(function(k){
opts[k] = data[k];
});
return opts;
};
PrivateKey.fromObj = function(obj) { PrivateKey.fromObj = function(obj) {
return new PrivateKey(obj); return new PrivateKey(PrivateKey.trim(obj));
}; };
PrivateKey.prototype.toObj = function() { PrivateKey.prototype.toObj = function() {
return { return {
extendedPrivateKeyString: this.getExtendedPrivateKeyString(), extendedPrivateKeyString: this.getExtendedPrivateKeyString(),
networkName: this.network.name, networkName: this.network.name,
privateKeyCache: this.privateKeyCache
}; };
}; };

File diff suppressed because one or more lines are too long

View file

@ -26,11 +26,9 @@ describe('Performance tests', function() {
generated.push(k); generated.push(k);
} }
var delta1 = new Date().getTime() - start1; var delta1 = new Date().getTime() - start1;
var backup = k1.toObj();
var k2 = PrivateKey.fromObj(backup);
var start2 = new Date().getTime(); var start2 = new Date().getTime();
for (var i = 0; i < generateN; i++) { for (var i = 0; i < generateN; i++) {
var k = JSON.stringify(k2.get(i, false).storeObj()); var k = JSON.stringify(k1.get(i, false).storeObj());
generated[i].should.equal(k); generated[i].should.equal(k);
} }
var delta2 = new Date().getTime() - start2; var delta2 = new Date().getTime() - start2;