Merge pull request #753 from yemel/performance/index-discovery-test

Small test refactor for performance
This commit is contained in:
Ryan X. Charles 2014-06-25 10:54:53 -07:00
commit a5e7b54d19
1 changed files with 74 additions and 68 deletions

View File

@ -331,6 +331,7 @@ describe('Wallet model', function() {
var w = cachedCreateW2(); var w = cachedCreateW2();
var spy = sinon.spy(w, 'scheduleConnect'); var spy = sinon.spy(w, 'scheduleConnect');
var callCount = 3; var callCount = 3;
w.reconnectDelay = 25;
w.netStart(); w.netStart();
setTimeout(function() { setTimeout(function() {
sinon.assert.callCount(spy, callCount); sinon.assert.callCount(spy, callCount);
@ -660,9 +661,17 @@ describe('Wallet model', function() {
}); });
}); });
var mockFakeActivity = function(w, f) {
var ADDRESSES_CHANGE = w.deriveAddresses(0, 20, true); describe('#indexDiscovery', function() {
var ADDRESSES_RECEIVE = w.deriveAddresses(0, 20, false); var ADDRESSES_CHANGE, ADDRESSES_RECEIVE, w;
before(function() {
w = cachedCreateW2();
ADDRESSES_CHANGE = w.deriveAddresses(0, 20, true);
ADDRESSES_RECEIVE = w.deriveAddresses(0, 20, false);
});
var mockFakeActivity = function(f) {
w.blockchain.checkActivity = function(addresses, cb) { w.blockchain.checkActivity = function(addresses, cb) {
var activity = new Array(addresses.length); var activity = new Array(addresses.length);
for (var i = 0; i < addresses.length; i++) { for (var i = 0; i < addresses.length; i++) {
@ -675,9 +684,8 @@ describe('Wallet model', function() {
} }
it('#indexDiscovery should work without found activities', function(done) { it('#indexDiscovery should work without found activities', function(done) {
var w = cachedCreateW2(); mockFakeActivity(function(index) {
mockFakeActivity(w, function(index) { return false;
return false
}); });
w.indexDiscovery(0, false, 5, function(e, lastActive) { w.indexDiscovery(0, false, 5, function(e, lastActive) {
lastActive.should.equal(-1); lastActive.should.equal(-1);
@ -686,9 +694,8 @@ describe('Wallet model', function() {
}); });
it('#indexDiscovery should continue scanning', function(done) { it('#indexDiscovery should continue scanning', function(done) {
var w = cachedCreateW2(); mockFakeActivity(function(index) {
mockFakeActivity(w, function(index) { return index <= 7;
return index <= 7
}); });
w.indexDiscovery(0, false, 5, function(e, lastActive) { w.indexDiscovery(0, false, 5, function(e, lastActive) {
lastActive.should.equal(7); lastActive.should.equal(7);
@ -697,9 +704,8 @@ describe('Wallet model', function() {
}); });
it('#indexDiscovery should not found beyond the scannWindow', function(done) { it('#indexDiscovery should not found beyond the scannWindow', function(done) {
var w = cachedCreateW2(); mockFakeActivity(function(index) {
mockFakeActivity(w, function(index) { return index <= 10 || index == 17;
return index <= 10 || index == 17
}); });
w.indexDiscovery(0, false, 5, function(e, lastActive) { w.indexDiscovery(0, false, 5, function(e, lastActive) {
lastActive.should.equal(10); lastActive.should.equal(10);
@ -708,9 +714,8 @@ describe('Wallet model', function() {
}); });
it('#indexDiscovery should look for activity along the scannWindow', function(done) { it('#indexDiscovery should look for activity along the scannWindow', function(done) {
var w = cachedCreateW2(); mockFakeActivity(function(index) {
mockFakeActivity(w, function(index) { return index <= 14 && index % 2 == 0;
return index <= 14 && index % 2 == 0
}); });
w.indexDiscovery(0, false, 5, function(e, lastActive) { w.indexDiscovery(0, false, 5, function(e, lastActive) {
lastActive.should.equal(14); lastActive.should.equal(14);
@ -719,10 +724,10 @@ describe('Wallet model', function() {
}); });
it('#updateIndexes should update correctly', function(done) { it('#updateIndexes should update correctly', function(done) {
var w = cachedCreateW2(); mockFakeActivity(function(index) {
mockFakeActivity(w, function(index) { return index <= 14 && index % 2 == 0;
return index <= 14 && index % 2 == 0
}); });
w.updateIndexes(function(err) { w.updateIndexes(function(err) {
w.publicKeyRing.indexes.receiveIndex.should.equal(15); w.publicKeyRing.indexes.receiveIndex.should.equal(15);
w.publicKeyRing.indexes.changeIndex.should.equal(15); w.publicKeyRing.indexes.changeIndex.should.equal(15);
@ -731,9 +736,8 @@ describe('Wallet model', function() {
}); });
it('#updateIndexes should store and emit event', function(done) { it('#updateIndexes should store and emit event', function(done) {
var w = cachedCreateW2(); mockFakeActivity(function(index) {
mockFakeActivity(w, function(index) { return index <= 14 && index % 2 == 0;
return index <= 14 && index % 2 == 0
}); });
var spyStore = sinon.spy(w, 'store'); var spyStore = sinon.spy(w, 'store');
var spyEmit = sinon.spy(w, 'emit'); var spyEmit = sinon.spy(w, 'emit');
@ -744,6 +748,8 @@ describe('Wallet model', function() {
}); });
}); });
});
it('#deriveAddresses', function(done) { it('#deriveAddresses', function(done) {
var w = cachedCreateW2(); var w = cachedCreateW2();
var addresses1 = w.deriveAddresses(0, 5, false); var addresses1 = w.deriveAddresses(0, 5, false);