diff --git a/Makefile b/Makefile index 8dcfe3c3a0..2f501c6949 100644 --- a/Makefile +++ b/Makefile @@ -8,9 +8,6 @@ .PHONY: getf-darwin getf-darwin-386 getf-darwin-amd64 .PHONY: getf-windows getf-windows-386 getf-windows-amd64 -GOBIN = $(shell pwd)/build/bin -GO ?= latest - getf: build/env.sh go run build/ci.go install ./cmd/getf @echo "Done building." diff --git a/build/env.sh b/build/env.sh index 3914555d1b..d158192159 100755 --- a/build/env.sh +++ b/build/env.sh @@ -2,11 +2,6 @@ set -e -if [ ! -f "build/env.sh" ]; then - echo "$0 must be run from the root of the repository." - exit 2 -fi - # Create fake Go workspace if it doesn't exist yet. workspace="$PWD/build/_workspace" root="$PWD" diff --git a/cmd/faucet/faucet.go b/cmd/faucet/faucet.go index e7c6ff2f66..df74f4e531 100644 --- a/cmd/faucet/faucet.go +++ b/cmd/faucet/faucet.go @@ -66,7 +66,7 @@ var ( apiPortFlag = flag.Int("apiport", 8080, "Listener port for the HTTP API connection") ethPortFlag = flag.Int("ethport", 30303, "Listener port for the devp2p connection") bootFlag = flag.String("bootnodes", "", "Comma separated bootnode enode URLs to seed with") - netFlag = flag.Uint64("network", 0, "Network ID to use for the Ethereum protocol") + netFlag = flag.Uint64("network", 1, "Network ID to use for the Ethereum protocol") statsFlag = flag.String("ethstats", "", "Ethstats network monitoring auth string") netnameFlag = flag.String("faucet.name", "", "Network name to assign to the faucet") diff --git a/eth/backend.go b/eth/backend.go index ac4b4c84fb..1a16fbe129 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -134,7 +134,7 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) { bloomIndexer: NewBloomIndexer(chainDb, params.BloomBitsBlocks), } - log.Info("Initialising Ethereum protocol", "versions", ProtocolVersions, "network", config.NetworkId) + log.Info("Initialising EtherFact protocol", "versions", ProtocolVersions, "network", config.NetworkId) if !config.SkipBcVersionCheck { bcVersion := core.GetBlockChainVersion(chainDb)