status-im
/
status-go
mirror of https://github.com/status-im/status-go.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Cleanup after merging wnode-status and statusd (#554)

This commit is contained in:
Ivan Daniluk 2018-01-17 22:40:14 +01:00 committed by GitHub
parent 5a5c5d3a5c
commit ea55ac0744
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -1,11 +1,11 @@
# Build wnode-status in a Go builder container # Build status-go in a Go builder container
FROM golang:1.9-alpine as builder FROM golang:1.9-alpine as builder
RUN apk add --no-cache make gcc musl-dev linux-headers RUN apk add --no-cache make gcc musl-dev linux-headers
RUN mkdir -p /go/src/github.com/status-im/status-go RUN mkdir -p /go/src/github.com/status-im/status-go
ADD . /go/src/github.com/status-im/status-go ADD . /go/src/github.com/status-im/status-go
RUN cd /go/src/github.com/status-im/status-go && make statusgo && make wnode-status RUN cd /go/src/github.com/status-im/status-go && make statusgo
# Copy the binary to the second image # Copy the binary to the second image
FROM alpine:latest FROM alpine:latest

4
cmd/statusd/main.go
View File

@ -33,7 +33,7 @@ var (
logLevel = flag.String("log", "INFO", `Log level, one of: "ERROR", "WARN", "INFO", "DEBUG", and "TRACE"`) logLevel = flag.String("log", "INFO", `Log level, one of: "ERROR", "WARN", "INFO", "DEBUG", and "TRACE"`)
logFile = flag.String("logfile", "", "Path to the log file") logFile = flag.String("logfile", "", "Path to the log file")
version = flag.Bool("version", false, "Print version") version = flag.Bool("version", false, "Print version")
les = flag.Bool("les", false, "LES protocol") lesEnabled = flag.Bool("les", true, "LES protocol enabled")
listenAddr = flag.String("listenaddr", ":30303", "IP address and port of this node (e.g. 127.0.0.1:30303)") listenAddr = flag.String("listenaddr", ":30303", "IP address and port of this node (e.g. 127.0.0.1:30303)")
standalone = flag.Bool("standalone", true, "Don't actively connect to peers, wait for incoming connections") standalone = flag.Bool("standalone", true, "Don't actively connect to peers, wait for incoming connections")
@ -129,7 +129,7 @@ func makeNodeConfig() (*params.NodeConfig, error) {
nodeConfig.HTTPPort = *httpPort nodeConfig.HTTPPort = *httpPort
nodeConfig.IPCEnabled = *ipcEnabled nodeConfig.IPCEnabled = *ipcEnabled
nodeConfig.LightEthConfig.Enabled = *les nodeConfig.LightEthConfig.Enabled = *lesEnabled
nodeConfig.SwarmConfig.Enabled = *swarmEnabled nodeConfig.SwarmConfig.Enabled = *swarmEnabled
if *whisperEnabled { if *whisperEnabled {

2
cmd/statusd/whispercfg.go
View File

@ -9,7 +9,7 @@ import (
"github.com/status-im/status-go/geth/params" "github.com/status-im/status-go/geth/params"
) )
// makeNodeConfig creates node configuration object from flags // whisperConfig creates node configuration object from flags
func whisperConfig(nodeConfig *params.NodeConfig) (*params.NodeConfig, error) { func whisperConfig(nodeConfig *params.NodeConfig) (*params.NodeConfig, error) {
nodeConfig.ListenAddr = *listenAddr nodeConfig.ListenAddr = *listenAddr

10
static/tests/mailserver.js
View File

@ -13,7 +13,7 @@ describe('Whisper MailServer', () => {
describe('Check prerequisites', () => { describe('Check prerequisites', () => {
console.log('Expecting MailServer running.') console.log('Expecting MailServer running.')
console.log('./build/bin/wnode-status -mailserver -passwordfile=./static/keys/wnodepassword -http -httpport 8540 -listenaddr=127.0.0.1:8549 -identity=./static/keys/wnodekey') console.log('./build/bin/statusd -les=false -shh -shh.mailserver -passwordfile=./static/keys/wnodepassword -http -httpport 8540 -listenaddr=127.0.0.1:8549 -identity=./static/keys/wnodekey')
it('MailServer should be running', () => { it('MailServer should be running', () => {
const mailServer = new Web3(new Web3.providers.HttpProvider('http://localhost:8540')); const mailServer = new Web3(new Web3.providers.HttpProvider('http://localhost:8540'));
@ -28,8 +28,8 @@ describe('Whisper MailServer', () => {
before((done) => { before((done) => {
nodeAProcess = spawn( nodeAProcess = spawn(
'./build/bin/wnode-status', './build/bin/statusd',
['-datadir', 'wnode-data-1', '-http', '-httpport', '8590'] ['-shh', '-les=false', '-datadir', 'wnode-data-1', '-http', '-httpport', '8590']
); );
nodeA = new Web3(new Web3.providers.HttpProvider('http://localhost:8590')); nodeA = new Web3(new Web3.providers.HttpProvider('http://localhost:8590'));
@ -82,8 +82,8 @@ describe('Whisper MailServer', () => {
before((done) => { before((done) => {
nodeBProcess = spawn( nodeBProcess = spawn(
'./build/bin/wnode-status', './build/bin/statusd',
['-datadir', 'wnode-data-2', '-http', '-httpport', '8591', '-log', 'INFO', '-logfile', 'wnode-data-2/wnode.log'] ['-shh', '-les=false', '-datadir', 'wnode-data-2', '-http', '-httpport', '8591', '-log', 'INFO', '-logfile', 'wnode-data-2/wnode.log']
); );
nodeB = new Web3(new Web3.providers.HttpProvider('http://localhost:8591')); nodeB = new Web3(new Web3.providers.HttpProvider('http://localhost:8591'));