From 0fc4c1313ec27cd9962d95c298078a5ce311604f Mon Sep 17 00:00:00 2001
From: Derek May <32908855+riddlez666@users.noreply.github.com>
Date: Sat, 17 Mar 2018 13:52:42 -0700
Subject: [PATCH] rebrand to egem.
---
Makefile | 124 +++++++++---------
build/nsis.install.nsh | 4 +-
build/nsis.uninstall.nsh | 2 +-
cmd/{geth => egem}/accountcmd.go | 0
cmd/{geth => egem}/accountcmd_test.go | 0
cmd/{geth => egem}/bugcmd.go | 0
cmd/{geth => egem}/chaincmd.go | 0
cmd/{geth => egem}/config.go | 2 +-
cmd/{geth => egem}/consolecmd.go | 0
cmd/{geth => egem}/consolecmd_test.go | 2 +-
cmd/{geth => egem}/dao_test.go | 0
cmd/{geth => egem}/genesis_test.go | 0
cmd/{geth => egem}/main.go | 2 +-
cmd/{geth => egem}/misccmd.go | 0
cmd/{geth => egem}/monitorcmd.go | 0
cmd/{geth => egem}/run_test.go | 0
cmd/{geth => egem}/testdata/empty.js | 0
cmd/{geth => egem}/testdata/guswallet.json | 0
cmd/{geth => egem}/testdata/passwords.txt | 0
.../testdata/wrong-passwords.txt | 0
cmd/{geth => egem}/usage.go | 0
cmd/puppeth/module_dashboard.go | 4 +-
node/config_test.go | 14 +-
23 files changed, 77 insertions(+), 77 deletions(-)
rename cmd/{geth => egem}/accountcmd.go (100%)
rename cmd/{geth => egem}/accountcmd_test.go (100%)
rename cmd/{geth => egem}/bugcmd.go (100%)
rename cmd/{geth => egem}/chaincmd.go (100%)
rename cmd/{geth => egem}/config.go (99%)
rename cmd/{geth => egem}/consolecmd.go (100%)
rename cmd/{geth => egem}/consolecmd_test.go (99%)
rename cmd/{geth => egem}/dao_test.go (100%)
rename cmd/{geth => egem}/genesis_test.go (100%)
rename cmd/{geth => egem}/main.go (99%)
rename cmd/{geth => egem}/misccmd.go (100%)
rename cmd/{geth => egem}/monitorcmd.go (100%)
rename cmd/{geth => egem}/run_test.go (100%)
rename cmd/{geth => egem}/testdata/empty.js (100%)
rename cmd/{geth => egem}/testdata/guswallet.json (100%)
rename cmd/{geth => egem}/testdata/passwords.txt (100%)
rename cmd/{geth => egem}/testdata/wrong-passwords.txt (100%)
rename cmd/{geth => egem}/usage.go (100%)
diff --git a/Makefile b/Makefile
index 3922d6015b..92f7b7950f 100644
--- a/Makefile
+++ b/Makefile
@@ -2,19 +2,19 @@
# with Go source code. If you know what GOPATH is then you probably
# don't need to bother with make.
-.PHONY: geth android ios geth-cross swarm evm all test clean
-.PHONY: geth-linux geth-linux-386 geth-linux-amd64 geth-linux-mips64 geth-linux-mips64le
-.PHONY: geth-linux-arm geth-linux-arm-5 geth-linux-arm-6 geth-linux-arm-7 geth-linux-arm64
-.PHONY: geth-darwin geth-darwin-386 geth-darwin-amd64
-.PHONY: geth-windows geth-windows-386 geth-windows-amd64
+.PHONY: egem android ios egem-cross swarm evm all test clean
+.PHONY: egem-linux egem-linux-386 egem-linux-amd64 egem-linux-mips64 egem-linux-mips64le
+.PHONY: egem-linux-arm egem-linux-arm-5 egem-linux-arm-6 egem-linux-arm-7 egem-linux-arm64
+.PHONY: egem-darwin egem-darwin-386 egem-darwin-amd64
+.PHONY: egem-windows egem-windows-386 egem-windows-amd64
GOBIN = $(shell pwd)/build/bin
GO ?= latest
-geth:
- build/env.sh go run build/ci.go install ./cmd/geth
+egem:
+ build/env.sh go run build/ci.go install ./cmd/egem
@echo "Done building."
- @echo "Run \"$(GOBIN)/geth\" to launch geth."
+ @echo "Run \"$(GOBIN)/egem\" to launch egem."
swarm:
build/env.sh go run build/ci.go install ./cmd/swarm
@@ -27,12 +27,12 @@ all:
android:
build/env.sh go run build/ci.go aar --local
@echo "Done building."
- @echo "Import \"$(GOBIN)/geth.aar\" to use the library."
+ @echo "Import \"$(GOBIN)/egem.aar\" to use the library."
ios:
build/env.sh go run build/ci.go xcode --local
@echo "Done building."
- @echo "Import \"$(GOBIN)/Geth.framework\" to use the library."
+ @echo "Import \"$(GOBIN)/egem.framework\" to use the library."
test: all
build/env.sh go run build/ci.go test
@@ -55,92 +55,92 @@ devtools:
# Cross Compilation Targets (xgo)
-geth-cross: geth-linux geth-darwin geth-windows geth-android geth-ios
+egem-cross: egem-linux egem-darwin egem-windows egem-android egem-ios
@echo "Full cross compilation done:"
- @ls -ld $(GOBIN)/geth-*
+ @ls -ld $(GOBIN)/egem-*
-geth-linux: geth-linux-386 geth-linux-amd64 geth-linux-arm geth-linux-mips64 geth-linux-mips64le
+egem-linux: egem-linux-386 egem-linux-amd64 egem-linux-arm egem-linux-mips64 egem-linux-mips64le
@echo "Linux cross compilation done:"
- @ls -ld $(GOBIN)/geth-linux-*
+ @ls -ld $(GOBIN)/egem-linux-*
-geth-linux-386:
- build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/386 -v ./cmd/geth
+egem-linux-386:
+ build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/386 -v ./cmd/egem
@echo "Linux 386 cross compilation done:"
- @ls -ld $(GOBIN)/geth-linux-* | grep 386
+ @ls -ld $(GOBIN)/egem-linux-* | grep 386
-geth-linux-amd64:
- build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/amd64 -v ./cmd/geth
+egem-linux-amd64:
+ build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/amd64 -v ./cmd/egem
@echo "Linux amd64 cross compilation done:"
- @ls -ld $(GOBIN)/geth-linux-* | grep amd64
+ @ls -ld $(GOBIN)/egem-linux-* | grep amd64
-geth-linux-arm: geth-linux-arm-5 geth-linux-arm-6 geth-linux-arm-7 geth-linux-arm64
+egem-linux-arm: egem-linux-arm-5 egem-linux-arm-6 egem-linux-arm-7 egem-linux-arm64
@echo "Linux ARM cross compilation done:"
- @ls -ld $(GOBIN)/geth-linux-* | grep arm
+ @ls -ld $(GOBIN)/egem-linux-* | grep arm
-geth-linux-arm-5:
- build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/arm-5 -v ./cmd/geth
+egem-linux-arm-5:
+ build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/arm-5 -v ./cmd/egem
@echo "Linux ARMv5 cross compilation done:"
- @ls -ld $(GOBIN)/geth-linux-* | grep arm-5
+ @ls -ld $(GOBIN)/egem-linux-* | grep arm-5
-geth-linux-arm-6:
- build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/arm-6 -v ./cmd/geth
+egem-linux-arm-6:
+ build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/arm-6 -v ./cmd/egem
@echo "Linux ARMv6 cross compilation done:"
- @ls -ld $(GOBIN)/geth-linux-* | grep arm-6
+ @ls -ld $(GOBIN)/egem-linux-* | grep arm-6
-geth-linux-arm-7:
- build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/arm-7 -v ./cmd/geth
+egem-linux-arm-7:
+ build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/arm-7 -v ./cmd/egem
@echo "Linux ARMv7 cross compilation done:"
- @ls -ld $(GOBIN)/geth-linux-* | grep arm-7
+ @ls -ld $(GOBIN)/egem-linux-* | grep arm-7
-geth-linux-arm64:
- build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/arm64 -v ./cmd/geth
+egem-linux-arm64:
+ build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/arm64 -v ./cmd/egem
@echo "Linux ARM64 cross compilation done:"
- @ls -ld $(GOBIN)/geth-linux-* | grep arm64
+ @ls -ld $(GOBIN)/egem-linux-* | grep arm64
-geth-linux-mips:
- build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/mips --ldflags '-extldflags "-static"' -v ./cmd/geth
+egem-linux-mips:
+ build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/mips --ldflags '-extldflags "-static"' -v ./cmd/egem
@echo "Linux MIPS cross compilation done:"
- @ls -ld $(GOBIN)/geth-linux-* | grep mips
+ @ls -ld $(GOBIN)/egem-linux-* | grep mips
-geth-linux-mipsle:
- build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/mipsle --ldflags '-extldflags "-static"' -v ./cmd/geth
+egem-linux-mipsle:
+ build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/mipsle --ldflags '-extldflags "-static"' -v ./cmd/egem
@echo "Linux MIPSle cross compilation done:"
- @ls -ld $(GOBIN)/geth-linux-* | grep mipsle
+ @ls -ld $(GOBIN)/egem-linux-* | grep mipsle
-geth-linux-mips64:
- build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/mips64 --ldflags '-extldflags "-static"' -v ./cmd/geth
+egem-linux-mips64:
+ build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/mips64 --ldflags '-extldflags "-static"' -v ./cmd/egem
@echo "Linux MIPS64 cross compilation done:"
- @ls -ld $(GOBIN)/geth-linux-* | grep mips64
+ @ls -ld $(GOBIN)/egem-linux-* | grep mips64
-geth-linux-mips64le:
- build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/mips64le --ldflags '-extldflags "-static"' -v ./cmd/geth
+egem-linux-mips64le:
+ build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/mips64le --ldflags '-extldflags "-static"' -v ./cmd/egem
@echo "Linux MIPS64le cross compilation done:"
- @ls -ld $(GOBIN)/geth-linux-* | grep mips64le
+ @ls -ld $(GOBIN)/egem-linux-* | grep mips64le
-geth-darwin: geth-darwin-386 geth-darwin-amd64
+egem-darwin: egem-darwin-386 egem-darwin-amd64
@echo "Darwin cross compilation done:"
- @ls -ld $(GOBIN)/geth-darwin-*
+ @ls -ld $(GOBIN)/egem-darwin-*
-geth-darwin-386:
- build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=darwin/386 -v ./cmd/geth
+egem-darwin-386:
+ build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=darwin/386 -v ./cmd/egem
@echo "Darwin 386 cross compilation done:"
- @ls -ld $(GOBIN)/geth-darwin-* | grep 386
+ @ls -ld $(GOBIN)/egem-darwin-* | grep 386
-geth-darwin-amd64:
- build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=darwin/amd64 -v ./cmd/geth
+egem-darwin-amd64:
+ build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=darwin/amd64 -v ./cmd/egem
@echo "Darwin amd64 cross compilation done:"
- @ls -ld $(GOBIN)/geth-darwin-* | grep amd64
+ @ls -ld $(GOBIN)/egem-darwin-* | grep amd64
-geth-windows: geth-windows-386 geth-windows-amd64
+egem-windows: egem-windows-386 egem-windows-amd64
@echo "Windows cross compilation done:"
- @ls -ld $(GOBIN)/geth-windows-*
+ @ls -ld $(GOBIN)/egem-windows-*
-geth-windows-386:
- build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=windows/386 -v ./cmd/geth
+egem-windows-386:
+ build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=windows/386 -v ./cmd/egem
@echo "Windows 386 cross compilation done:"
- @ls -ld $(GOBIN)/geth-windows-* | grep 386
+ @ls -ld $(GOBIN)/egem-windows-* | grep 386
-geth-windows-amd64:
- build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=windows/amd64 -v ./cmd/geth
+egem-windows-amd64:
+ build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=windows/amd64 -v ./cmd/egem
@echo "Windows amd64 cross compilation done:"
- @ls -ld $(GOBIN)/geth-windows-* | grep amd64
+ @ls -ld $(GOBIN)/egem-windows-* | grep amd64
diff --git a/build/nsis.install.nsh b/build/nsis.install.nsh
index 0beb94b17a..34849f77f7 100644
--- a/build/nsis.install.nsh
+++ b/build/nsis.install.nsh
@@ -34,8 +34,8 @@ Section "Geth" GETH_IDX
SimpleFC::AdvAddRule "Geth UDP discovery (UDP:30303)" "" 17 2 1 2147483647 1 "$INSTDIR\geth.exe" "" "" "Ethereum" "" 30303 "" ""
# Set default IPC endpoint (https://github.com/ethereum/EIPs/issues/147)
- ${EnvVarUpdate} $0 "ETHEREUM_SOCKET" "R" "HKLM" "\\.\pipe\geth.ipc"
- ${EnvVarUpdate} $0 "ETHEREUM_SOCKET" "A" "HKLM" "\\.\pipe\geth.ipc"
+ ${EnvVarUpdate} $0 "ETHEREUM_SOCKET" "R" "HKLM" "\\.\pipe\egem.ipc"
+ ${EnvVarUpdate} $0 "ETHEREUM_SOCKET" "A" "HKLM" "\\.\pipe\egem.ipc"
# Add instdir to PATH
Push "$INSTDIR"
diff --git a/build/nsis.uninstall.nsh b/build/nsis.uninstall.nsh
index 6358faa74e..7558565997 100644
--- a/build/nsis.uninstall.nsh
+++ b/build/nsis.uninstall.nsh
@@ -22,7 +22,7 @@ Section "Uninstall"
SimpleFC::AdvRemoveRule "Geth UDP discovery (UDP:30303)"
# Remove IPC endpoint (https://github.com/ethereum/EIPs/issues/147)
- ${un.EnvVarUpdate} $0 "ETHEREUM_SOCKET" "R" "HKLM" "\\.\pipe\geth.ipc"
+ ${un.EnvVarUpdate} $0 "ETHEREUM_SOCKET" "R" "HKLM" "\\.\pipe\egem.ipc"
# Remove install directory from PATH
Push "$INSTDIR"
diff --git a/cmd/geth/accountcmd.go b/cmd/egem/accountcmd.go
similarity index 100%
rename from cmd/geth/accountcmd.go
rename to cmd/egem/accountcmd.go
diff --git a/cmd/geth/accountcmd_test.go b/cmd/egem/accountcmd_test.go
similarity index 100%
rename from cmd/geth/accountcmd_test.go
rename to cmd/egem/accountcmd_test.go
diff --git a/cmd/geth/bugcmd.go b/cmd/egem/bugcmd.go
similarity index 100%
rename from cmd/geth/bugcmd.go
rename to cmd/egem/bugcmd.go
diff --git a/cmd/geth/chaincmd.go b/cmd/egem/chaincmd.go
similarity index 100%
rename from cmd/geth/chaincmd.go
rename to cmd/egem/chaincmd.go
diff --git a/cmd/geth/config.go b/cmd/egem/config.go
similarity index 99%
rename from cmd/geth/config.go
rename to cmd/egem/config.go
index 27f675641b..9ac86ed9f3 100644
--- a/cmd/geth/config.go
+++ b/cmd/egem/config.go
@@ -103,7 +103,7 @@ func defaultNodeConfig() node.Config {
cfg.Version = params.VersionWithCommit(gitCommit)
cfg.HTTPModules = append(cfg.HTTPModules, "eth", "shh")
cfg.WSModules = append(cfg.WSModules, "eth", "shh")
- cfg.IPCPath = "geth.ipc"
+ cfg.IPCPath = "egem.ipc"
return cfg
}
diff --git a/cmd/geth/consolecmd.go b/cmd/egem/consolecmd.go
similarity index 100%
rename from cmd/geth/consolecmd.go
rename to cmd/egem/consolecmd.go
diff --git a/cmd/geth/consolecmd_test.go b/cmd/egem/consolecmd_test.go
similarity index 99%
rename from cmd/geth/consolecmd_test.go
rename to cmd/egem/consolecmd_test.go
index 9863d0b5c2..79f4d1d451 100644
--- a/cmd/geth/consolecmd_test.go
+++ b/cmd/egem/consolecmd_test.go
@@ -79,7 +79,7 @@ func TestIPCAttachWelcome(t *testing.T) {
} else {
ws := tmpdir(t)
defer os.RemoveAll(ws)
- ipc = filepath.Join(ws, "geth.ipc")
+ ipc = filepath.Join(ws, "egem.ipc")
}
// Note: we need --shh because testAttachWelcome checks for default
// list of ipc modules and shh is included there.
diff --git a/cmd/geth/dao_test.go b/cmd/egem/dao_test.go
similarity index 100%
rename from cmd/geth/dao_test.go
rename to cmd/egem/dao_test.go
diff --git a/cmd/geth/genesis_test.go b/cmd/egem/genesis_test.go
similarity index 100%
rename from cmd/geth/genesis_test.go
rename to cmd/egem/genesis_test.go
diff --git a/cmd/geth/main.go b/cmd/egem/main.go
similarity index 99%
rename from cmd/geth/main.go
rename to cmd/egem/main.go
index 73cef0eb5e..ea4d941da0 100644
--- a/cmd/geth/main.go
+++ b/cmd/egem/main.go
@@ -40,7 +40,7 @@ import (
)
const (
- clientIdentifier = "geth" // Client identifier to advertise over the network
+ clientIdentifier = "egem" // Client identifier to advertise over the network
)
var (
diff --git a/cmd/geth/misccmd.go b/cmd/egem/misccmd.go
similarity index 100%
rename from cmd/geth/misccmd.go
rename to cmd/egem/misccmd.go
diff --git a/cmd/geth/monitorcmd.go b/cmd/egem/monitorcmd.go
similarity index 100%
rename from cmd/geth/monitorcmd.go
rename to cmd/egem/monitorcmd.go
diff --git a/cmd/geth/run_test.go b/cmd/egem/run_test.go
similarity index 100%
rename from cmd/geth/run_test.go
rename to cmd/egem/run_test.go
diff --git a/cmd/geth/testdata/empty.js b/cmd/egem/testdata/empty.js
similarity index 100%
rename from cmd/geth/testdata/empty.js
rename to cmd/egem/testdata/empty.js
diff --git a/cmd/geth/testdata/guswallet.json b/cmd/egem/testdata/guswallet.json
similarity index 100%
rename from cmd/geth/testdata/guswallet.json
rename to cmd/egem/testdata/guswallet.json
diff --git a/cmd/geth/testdata/passwords.txt b/cmd/egem/testdata/passwords.txt
similarity index 100%
rename from cmd/geth/testdata/passwords.txt
rename to cmd/egem/testdata/passwords.txt
diff --git a/cmd/geth/testdata/wrong-passwords.txt b/cmd/egem/testdata/wrong-passwords.txt
similarity index 100%
rename from cmd/geth/testdata/wrong-passwords.txt
rename to cmd/egem/testdata/wrong-passwords.txt
diff --git a/cmd/geth/usage.go b/cmd/egem/usage.go
similarity index 100%
rename from cmd/geth/usage.go
rename to cmd/egem/usage.go
diff --git a/cmd/puppeth/module_dashboard.go b/cmd/puppeth/module_dashboard.go
index c418c17642..4653b26a1c 100644
--- a/cmd/puppeth/module_dashboard.go
+++ b/cmd/puppeth/module_dashboard.go
@@ -208,7 +208,7 @@ var dashboardContent = `
geth --datadir=$HOME/.{{.Network}} init {{.GethGenesis}}
With your local chain initialized, you can start the Ethereum Wallet:
-
ethereumwallet --rpc $HOME/.{{.Network}}/geth.ipc --node-networkid={{.NetworkID}} --node-datadir=$HOME/.{{.Network}}{{if .Ethstats}} --node-ethstats='{{.Ethstats}}'{{end}} --node-bootnodes={{.BootnodesFlat}}
+ ethereumwallet --rpc $HOME/.{{.Network}}/egem.ipc --node-networkid={{.NetworkID}} --node-datadir=$HOME/.{{.Network}}{{if .Ethstats}} --node-ethstats='{{.Ethstats}}'{{end}} --node-bootnodes={{.BootnodesFlat}}
You can download the Ethereum Wallet from https://github.com/ethereum/mist/releases.
@@ -229,7 +229,7 @@ var dashboardContent = `
geth --datadir=$HOME/.{{.Network}} init {{.GethGenesis}}
With your local chain initialized, you can start Mist:
-
mist --rpc $HOME/.{{.Network}}/geth.ipc --node-networkid={{.NetworkID}} --node-datadir=$HOME/.{{.Network}}{{if .Ethstats}} --node-ethstats='{{.Ethstats}}'{{end}} --node-bootnodes={{.BootnodesFlat}}
+ mist --rpc $HOME/.{{.Network}}/egem.ipc --node-networkid={{.NetworkID}} --node-datadir=$HOME/.{{.Network}}{{if .Ethstats}} --node-ethstats='{{.Ethstats}}'{{end}} --node-bootnodes={{.BootnodesFlat}}
You can download the Mist browser from https://github.com/ethereum/mist/releases.
diff --git a/node/config_test.go b/node/config_test.go
index 5556184c85..2febb151c0 100644
--- a/node/config_test.go
+++ b/node/config_test.go
@@ -73,15 +73,15 @@ func TestIPCPathResolution(t *testing.T) {
}{
{"", "", false, ""},
{"data", "", false, ""},
- {"", "geth.ipc", false, filepath.Join(os.TempDir(), "geth.ipc")},
- {"data", "geth.ipc", false, "data/geth.ipc"},
- {"data", "./geth.ipc", false, "./geth.ipc"},
- {"data", "/geth.ipc", false, "/geth.ipc"},
+ {"", "egem.ipc", false, filepath.Join(os.TempDir(), "egem.ipc")},
+ {"data", "egem.ipc", false, "data/egem.ipc"},
+ {"data", "./egem.ipc", false, "./egem.ipc"},
+ {"data", "/egem.ipc", false, "/egem.ipc"},
{"", "", true, ``},
{"data", "", true, ``},
- {"", "geth.ipc", true, `\\.\pipe\geth.ipc`},
- {"data", "geth.ipc", true, `\\.\pipe\geth.ipc`},
- {"data", `\\.\pipe\geth.ipc`, true, `\\.\pipe\geth.ipc`},
+ {"", "egem.ipc", true, `\\.\pipe\egem.ipc`},
+ {"data", "egem.ipc", true, `\\.\pipe\egem.ipc`},
+ {"data", `\\.\pipe\egem.ipc`, true, `\\.\pipe\egem.ipc`},
}
for i, test := range tests {
// Only run when platform/test match