merge master changes
This commit is contained in:
parent
79e8701316
commit
4167827937
|
@ -26,6 +26,7 @@ var modules = [
|
|||
'Block',
|
||||
'Bloom',
|
||||
'Buffers.monkey',
|
||||
'Connection',
|
||||
'Deserialize',
|
||||
'Gruntfile',
|
||||
'Number.monkey',
|
||||
|
@ -65,7 +66,6 @@ b.require('./util/util');
|
|||
b.require('./util/EncodedData');
|
||||
b.require('./util/VersionedData');
|
||||
b.add('./browser/bignum_config.js');
|
||||
|
||||
modules.forEach(function(m) {
|
||||
b.require('./' + m + '.js' ,{expose: './'+m} );
|
||||
});
|
||||
|
|
|
@ -5,7 +5,7 @@ var bitcore = bitcore || require('../bitcore');
|
|||
|
||||
var should = chai.should();
|
||||
|
||||
var PeerManagerModule = bitcore.PeerManager || require('soop').load('PeerManager');
|
||||
var PeerManagerModule = bitcore.PeerManager || require('./PeerManager');
|
||||
|
||||
var PeerManager;
|
||||
|
||||
|
|
Loading…
Reference in New Issue