embarklabs
/
embark
mirror of https://github.com/embarklabs/embark.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix rebase

This commit is contained in:
emizzle 2018-10-04 22:49:04 +10:00 committed by Pascal Precht
parent 9aa3217331
commit 3e9abdcdd2
No known key found for this signature in database
GPG Key ID: 0EE28D8D6FD85D7D
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/modules/blockchain_process/blockchain.js
View File

@ -343,7 +343,7 @@ Blockchain.prototype.initChainAndGetAddress = function(callback) {
};
var BlockchainClient = function(blockchainConfig, client, env, onReadyCallback, onExitCallback) {
const isDev = Boolean(blockchainConfig.isDev);
const isDev = !!blockchainConfig.isDev;
// TODO add other clients at some point
if (client === 'geth') {
return new Blockchain({blockchainConfig, client: GethCommands, env, isDev, onReadyCallback, onExitCallback});

10
lib/modules/webserver/server.js
View File

@ -5,7 +5,6 @@ const expressWebSocket = require('express-ws');
const express = require('express');
const fs = require('../../core/fs');
require('http-shutdown').extend();
const webSocket = require('ws');
class Server {
constructor(options) {
@ -37,15 +36,6 @@ class Server {
this.app.use(main);
this.app.use('/coverage', coverage);
this.app.use(coverageStyle);
//this.wss = new webSocket.Server({server: this.server});
//this.events.on('outputDone', () => {
// this.wss.clients.forEach((ws) => {
// if (ws.readyState === webSocket.OPEN) {
// ws.send('outputDone');
// }
// });
//});
this.app.ws('/', (_ws, _req) => {});
const wss = expressWs.getWss('/');