RanchiMall/flocore
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #127 from ryanxcharles/bug/fix-node-tests

Browse Source 
fix mocha tests
This commit is contained in:
Ryan X. Charles 2014-03-10 13:51:10 -04:00
commit 8f3ae30612
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PeerManager.js
View File

@ -5,7 +5,7 @@ var log = imports.log || require('./util/log');
var network = imports.network || require('./networks')[config.network]; var network = imports.network || require('./networks')[config.network];
var Connection = imports.Connection || var Connection = imports.Connection ||
require('soop').load('Connection', {config: config, network: network}) || require('soop').load('./Connection', {config: config, network: network}) ||
require ('./Connection'); require ('./Connection');
var Peer = imports.Peer || require('./Peer'); var Peer = imports.Peer || require('./Peer');

3
browserify.js
View File

@ -32,7 +32,6 @@ var modules = [
'Block', 'Block',
'Bloom', 'Bloom',
'Buffers.monkey', 'Buffers.monkey',
'Connection',
'Deserialize', 'Deserialize',
'Gruntfile', 'Gruntfile',
'Number.monkey', 'Number.monkey',
@ -69,6 +68,8 @@ b.add('./browser/bignum_config.js');
b.require('./test/testdata.js', {expose: './testdata'}); b.require('./test/testdata.js', {expose: './testdata'});
b.transform('brfs'); b.transform('brfs');
b.require('./Connection', {expose: './Connection'});
modules.forEach(function(m) { modules.forEach(function(m) {
b.require('./' + m + '.js' ,{expose:m} ); b.require('./' + m + '.js' ,{expose:m} );
}); });