zcash-hackworks
/
bitcore-lib-zcash
mirror of https://github.com/zcash-hackworks/bitcore-lib-zcash.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

merge master changes

This commit is contained in:
Manuel Araoz 2014-03-10 15:00:25 -03:00
parent 79e8701316
commit 4167827937
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser/browserify.js
View File

@ -26,6 +26,7 @@ var modules = [
'Block', 'Block',
'Bloom', 'Bloom',
'Buffers.monkey', 'Buffers.monkey',
'Connection',
'Deserialize', 'Deserialize',
'Gruntfile', 'Gruntfile',
'Number.monkey', 'Number.monkey',
@ -65,7 +66,6 @@ b.require('./util/util');
b.require('./util/EncodedData'); b.require('./util/EncodedData');
b.require('./util/VersionedData'); b.require('./util/VersionedData');
b.add('./browser/bignum_config.js'); b.add('./browser/bignum_config.js');
modules.forEach(function(m) { modules.forEach(function(m) {
b.require('./' + m + '.js' ,{expose: './'+m} ); b.require('./' + m + '.js' ,{expose: './'+m} );
}); });

2
test/test.PeerManager.js
View File

@ -5,7 +5,7 @@ var bitcore = bitcore || require('../bitcore');
var should = chai.should(); var should = chai.should();
var PeerManagerModule = bitcore.PeerManager || require('soop').load('PeerManager'); var PeerManagerModule = bitcore.PeerManager || require('./PeerManager');
var PeerManager; var PeerManager;