Skip to content

Commit

Permalink
efsn is the executable name of the fusion server
Browse files Browse the repository at this point in the history
  • Loading branch information
bret-fusion committed Nov 16, 2018
1 parent 6e93d46 commit 477dba1
Show file tree
Hide file tree
Showing 48 changed files with 152 additions and 152 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ matrix:
- dput
- fakeroot
script:
- go run build/ci.go debsrc -signer "Go Ethereum Linux Builder <geth[email protected]>" -upload ppa:ethereum/ethereum
- go run build/ci.go debsrc -signer "Go Ethereum Linux Builder <efsn[email protected]>" -upload ppa:ethereum/ethereum

# This builder does the Linux Azure uploads
- os: linux
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@ GOBIN = $(shell pwd)/build/bin
GO ?= latest

geth:
build/env.sh go run build/ci.go install ./cmd/geth
build/env.sh go run build/ci.go install ./cmd/efsn
@echo "Done building."
@echo "Run \"$(GOBIN)/geth\" to launch geth."

debug:
# https://ethereum.stackexchange.com/questions/41489/how-to-debug-geth-with-delve?rq=1
@echo building debug version
build/env.sh go build -o ./build/bin/geth -gcflags=all='-N -l' -v ./cmd/geth
build/env.sh go build -o ./build/bin/efsn -gcflags=all='-N -l' -v ./cmd/efsn
@echo end building debug version
@echo "Run \"$(GOBIN)/geth\" to launch geth."
@echo "Run \"$(GOBIN)/efsn\" to launch geth."

swarm:
build/env.sh go run build/ci.go install ./cmd/swarm
Expand Down
4 changes: 2 additions & 2 deletions accounts/abi/bind/template.go
Original file line number Diff line number Diff line change
Expand Up @@ -427,8 +427,8 @@ const tmplSourceJava = `
package {{.Package}};
import org.ethereum.geth.*;
import org.ethereum.geth.internal.*;
import org.ethereum.efsn.*;
import org.ethereum.efsn.internal.*;
{{range $contract := .Contracts}}
public class {{.Type}} {
Expand Down
2 changes: 1 addition & 1 deletion accounts/keystore/keystore_plain_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (
)

func tmpKeyStoreIface(t *testing.T, encrypted bool) (dir string, ks keyStore) {
d, err := ioutil.TempDir("", "geth-keystore-test")
d, err := ioutil.TempDir("", "efsn-keystore-test")
if err != nil {
t.Fatal(err)
}
Expand Down
36 changes: 18 additions & 18 deletions build/ci.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,19 +64,19 @@ import (
)

var (
// Files that end up in the geth*.zip archive.
// Files that end up in the efsn*.zip archive.
gethArchiveFiles = []string{
"COPYING",
executablePath("geth"),
executablePath("efsn"),
}

// Files that end up in the geth-alltools*.zip archive.
// Files that end up in the efsn-alltools*.zip archive.
allToolsArchiveFiles = []string{
"COPYING",
executablePath("abigen"),
executablePath("bootnode"),
executablePath("evm"),
executablePath("geth"),
executablePath("efsn"),
executablePath("puppeth"),
executablePath("rlpdump"),
executablePath("wnode"),
Expand All @@ -103,7 +103,7 @@ var (
Description: "Developer utility version of the EVM (Ethereum Virtual Machine) that is capable of running bytecode snippets within a configurable environment and execution mode.",
},
{
BinaryName: "geth",
BinaryName: "efsn",
Description: "Ethereum CLI client.",
},
{
Expand Down Expand Up @@ -406,8 +406,8 @@ func doArchive(cmdline []string) {
env = build.Env()

basegeth = archiveBasename(*arch, params.ArchiveVersion(env.Commit))
geth = "geth-" + basegeth + ext
alltools = "geth-alltools-" + basegeth + ext
geth = "efsn-" + basegeth + ext
alltools = "efsn-alltools-" + basegeth + ext

baseswarm = archiveBasename(*arch, sv.ArchiveVersion(env.Commit))
swarm = "swarm-" + baseswarm + ext
Expand Down Expand Up @@ -539,7 +539,7 @@ func makeWorkdir(wdflag string) string {
if wdflag != "" {
err = os.MkdirAll(wdflag, 0744)
} else {
wdflag, err = ioutil.TempDir("", "geth-build-")
wdflag, err = ioutil.TempDir("", "efsn-build-")
}
if err != nil {
log.Fatal(err)
Expand Down Expand Up @@ -714,21 +714,21 @@ func doWindowsInstaller(cmdline []string) {
continue
}
allTools = append(allTools, filepath.Base(file))
if filepath.Base(file) == "geth.exe" {
if filepath.Base(file) == "efsn.exe" {
gethTool = file
} else {
devTools = append(devTools, file)
}
}

// Render NSIS scripts: Installer NSIS contains two installer sections,
// first section contains the geth binary, second section holds the dev tools.
// first section contains the efsn binary, second section holds the dev tools.
templateData := map[string]interface{}{
"License": "COPYING",
"Geth": gethTool,
"DevTools": devTools,
}
build.Render("build/nsis.geth.nsi", filepath.Join(*workdir, "geth.nsi"), 0644, nil)
build.Render("build/nsis.efsn.nsi", filepath.Join(*workdir, "efsn.nsi"), 0644, nil)
build.Render("build/nsis.install.nsh", filepath.Join(*workdir, "install.nsh"), 0644, templateData)
build.Render("build/nsis.uninstall.nsh", filepath.Join(*workdir, "uninstall.nsh"), 0644, allTools)
build.Render("build/nsis.pathupdate.nsh", filepath.Join(*workdir, "PathUpdate.nsh"), 0644, nil)
Expand All @@ -743,14 +743,14 @@ func doWindowsInstaller(cmdline []string) {
if env.Commit != "" {
version[2] += "-" + env.Commit[:8]
}
installer, _ := filepath.Abs("geth-" + archiveBasename(*arch, params.ArchiveVersion(env.Commit)) + ".exe")
installer, _ := filepath.Abs("efsn-" + archiveBasename(*arch, params.ArchiveVersion(env.Commit)) + ".exe")
build.MustRunCommand("makensis.exe",
"/DOUTPUTFILE="+installer,
"/DMAJORVERSION="+version[0],
"/DMINORVERSION="+version[1],
"/DBUILDVERSION="+version[2],
"/DARCH="+*arch,
filepath.Join(*workdir, "geth.nsi"),
filepath.Join(*workdir, "efsn.nsi"),
)

// Sign and publish installer.
Expand Down Expand Up @@ -785,7 +785,7 @@ func doAndroidArchive(cmdline []string) {

if *local {
// If we're building locally, copy bundle to build dir and skip Maven
os.Rename("geth.aar", filepath.Join(GOBIN, "geth.aar"))
os.Rename("efsn.aar", filepath.Join(GOBIN, "efsn.aar"))
return
}
meta := newMavenMetadata(env)
Expand All @@ -795,8 +795,8 @@ func doAndroidArchive(cmdline []string) {
maybeSkipArchive(env)

// Sign and upload the archive to Azure
archive := "geth-" + archiveBasename("android", params.ArchiveVersion(env.Commit)) + ".aar"
os.Rename("geth.aar", archive)
archive := "efsn-" + archiveBasename("android", params.ArchiveVersion(env.Commit)) + ".aar"
os.Rename("efsn.aar", archive)

if err := archiveUpload(archive, *upload, *signer); err != nil {
log.Fatal(err)
Expand Down Expand Up @@ -886,7 +886,7 @@ func newMavenMetadata(env build.Environment) mavenMetadata {
}
return mavenMetadata{
Version: version,
Package: "geth-" + version,
Package: "efsn-" + version,
Develop: isUnstableBuild(env),
Contributors: contribs,
}
Expand Down Expand Up @@ -915,7 +915,7 @@ func doXCodeFramework(cmdline []string) {
build.MustRun(bind)
return
}
archive := "geth-" + archiveBasename("ios", params.ArchiveVersion(env.Commit))
archive := "efsn-" + archiveBasename("ios", params.ArchiveVersion(env.Commit))
if err := os.Mkdir(archive, os.ModePerm); err != nil {
log.Fatal(err)
}
Expand Down
6 changes: 3 additions & 3 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ dependencies:
test:
override:
# Build Geth and move into a known folder
- make geth
- cp ./build/bin/geth $HOME/geth
- make efsn
- cp ./build/bin/efsn $HOME/efsn

# Run hive and move all generated logs into the public artifacts folder
- (cd ~/.go_workspace/src/github.com/karalabe/hive && hive --docker-noshell --client=efsn:local --override=$HOME/geth --test=. --sim=.)
- (cd ~/.go_workspace/src/github.com/karalabe/hive && hive --docker-noshell --client=efsn:local --override=$HOME/efsn --test=. --sim=.)
- cp -r ~/.go_workspace/src/github.com/karalabe/hive/workspace/logs/* $CIRCLE_ARTIFACTS
14 changes: 7 additions & 7 deletions cmd/geth/accountcmd.go → cmd/efsn/accountcmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ var (
ArgsUsage: "",
Category: "ACCOUNT COMMANDS",
Description: `
geth wallet import /path/to/my/presale.wallet
efsn wallet import /path/to/my/presale.wallet
will prompt for your password and imports your ether presale account.
It can be used non-interactively with the --password option taking a
Expand All @@ -56,7 +56,7 @@ passwordfile as argument containing the wallet password in plaintext.`,
utils.LightKDFFlag,
},
Description: `
geth wallet [options] /path/to/my/presale.wallet
efsn wallet [options] /path/to/my/presale.wallet
will prompt for your password and imports your ether presale account.
It can be used non-interactively with the --password option taking a
Expand Down Expand Up @@ -112,7 +112,7 @@ Print a short summary of all accounts`,
utils.LightKDFFlag,
},
Description: `
geth account new
efsn account new
Creates a new account and prints the address.
Expand All @@ -137,7 +137,7 @@ password to file or expose in any other way.
utils.LightKDFFlag,
},
Description: `
geth account update <address>
efsn account update <address>
Update an existing account.
Expand All @@ -149,7 +149,7 @@ format to the newest format or change the password for an account.
For non-interactive use the passphrase can be specified with the --password flag:
geth account update [options] <address>
efsn account update [options] <address>
Since only one password can be given, only format update can be performed,
changing your password is only possible interactively.
Expand All @@ -167,7 +167,7 @@ changing your password is only possible interactively.
},
ArgsUsage: "<keyFile>",
Description: `
geth account import <keyfile>
efsn account import <keyfile>
Imports an unencrypted private key from <keyfile> and creates a new account.
Prints the address.
Expand All @@ -180,7 +180,7 @@ You must remember this passphrase to unlock your account in the future.
For non-interactive use the passphrase can be specified with the -password flag:
geth account import [options] <keyfile>
efsn account import [options] <keyfile>
Note:
As you can directly copy your encrypted accounts to another ethereum instance,
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion cmd/geth/bugcmd.go → cmd/efsn/bugcmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import (
var bugCommand = cli.Command{
Action: utils.MigrateFlags(reportBug),
Name: "bug",
Usage: "opens a window to report a bug on the geth repo",
Usage: "opens a window to report a bug on the efsn repo",
ArgsUsage: " ",
Category: "MISCELLANEOUS COMMANDS",
}
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion cmd/geth/config.go → cmd/efsn/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "efsn.ipc"
return cfg
}

Expand Down
22 changes: 11 additions & 11 deletions cmd/geth/consolecmd.go → cmd/efsn/consolecmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ See https://github.com/FusionFoundation/efsn/wiki/JavaScript-Console.`,
The Geth console is an interactive shell for the JavaScript runtime environment
which exposes a node admin interface as well as the Ðapp JavaScript API.
See https://github.com/FusionFoundation/efsn/wiki/JavaScript-Console.
This command allows to open a console on a running geth node.`,
This command allows to open a console on a running efsn node.`,
}

javascriptCommand = cli.Command{
Expand All @@ -73,7 +73,7 @@ JavaScript API. See https://github.com/FusionFoundation/efsn/wiki/JavaScript-Con
}
)

// localConsole starts a new geth node, attaching a JavaScript console to it at the
// localConsole starts a new efsn node, attaching a JavaScript console to it at the
// same time.
func localConsole(ctx *cli.Context) error {
// Create and start the node based on the CLI flags
Expand All @@ -84,7 +84,7 @@ func localConsole(ctx *cli.Context) error {
// Attach to the newly started node and start the JavaScript console
client, err := node.Attach()
if err != nil {
utils.Fatalf("Failed to attach to the inproc geth: %v", err)
utils.Fatalf("Failed to attach to the inproc efsn: %v", err)
}
config := console.Config{
DataDir: utils.MakeDataDir(ctx),
Expand All @@ -111,10 +111,10 @@ func localConsole(ctx *cli.Context) error {
return nil
}

// remoteConsole will connect to a remote geth instance, attaching a JavaScript
// remoteConsole will connect to a remote efsn instance, attaching a JavaScript
// console to it.
func remoteConsole(ctx *cli.Context) error {
// Attach to a remotely running geth instance and start the JavaScript console
// Attach to a remotely running efsn instance and start the JavaScript console
endpoint := ctx.Args().First()
if endpoint == "" {
path := node.DefaultDataDir()
Expand All @@ -128,11 +128,11 @@ func remoteConsole(ctx *cli.Context) error {
path = filepath.Join(path, "rinkeby")
}
}
endpoint = fmt.Sprintf("%s/geth.ipc", path)
endpoint = fmt.Sprintf("%s/efsn.ipc", path)
}
client, err := dialRPC(endpoint)
if err != nil {
utils.Fatalf("Unable to attach to remote geth: %v", err)
utils.Fatalf("Unable to attach to remote efsn: %v", err)
}
config := console.Config{
DataDir: utils.MakeDataDir(ctx),
Expand Down Expand Up @@ -161,19 +161,19 @@ func remoteConsole(ctx *cli.Context) error {

// dialRPC returns a RPC client which connects to the given endpoint.
// The check for empty endpoint implements the defaulting logic
// for "geth attach" and "geth monitor" with no argument.
// for "efsn attach" and "efsn monitor" with no argument.
func dialRPC(endpoint string) (*rpc.Client, error) {
if endpoint == "" {
endpoint = node.DefaultIPCEndpoint(clientIdentifier)
} else if strings.HasPrefix(endpoint, "rpc:") || strings.HasPrefix(endpoint, "ipc:") {
// Backwards compatibility with geth < 1.5 which required
// Backwards compatibility with efsn < 1.5 which required
// these prefixes.
endpoint = endpoint[4:]
}
return rpc.Dial(endpoint)
}

// ephemeralConsole starts a new geth node, attaches an ephemeral JavaScript
// ephemeralConsole starts a new efsn node, attaches an ephemeral JavaScript
// console to it, executes each of the files specified as arguments and tears
// everything down.
func ephemeralConsole(ctx *cli.Context) error {
Expand All @@ -185,7 +185,7 @@ func ephemeralConsole(ctx *cli.Context) error {
// Attach to the newly started node and start the JavaScript console
client, err := node.Attach()
if err != nil {
utils.Fatalf("Failed to attach to the inproc geth: %v", err)
utils.Fatalf("Failed to attach to the inproc efsn: %v", err)
}
config := console.Config{
DataDir: utils.MakeDataDir(ctx),
Expand Down
6 changes: 3 additions & 3 deletions cmd/geth/consolecmd_test.go → cmd/efsn/consolecmd_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const (
func TestConsoleWelcome(t *testing.T) {
coinbase := "0x8605cdbbdb6d264aa742e77020dcbc58fcdce182"

// Start a geth console, make sure it's cleaned up and terminate the console
// Start a efsn console, make sure it's cleaned up and terminate the console
geth := runGeth(t,
"--port", "0", "--maxpeers", "0", "--nodiscover", "--nat", "none",
"--etherbase", coinbase, "--shh",
Expand Down Expand Up @@ -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, "efsn.ipc")
}
// Note: we need --shh because testAttachWelcome checks for default
// list of ipc modules and shh is included there.
Expand Down Expand Up @@ -124,7 +124,7 @@ func TestWSAttachWelcome(t *testing.T) {
}

func testAttachWelcome(t *testing.T, geth *testgeth, endpoint, apis string) {
// Attach to a running geth note and terminate immediately
// Attach to a running efsn note and terminate immediately
attach := runGeth(t, "attach", endpoint)
defer attach.ExpectExit()
attach.CloseStdin()
Expand Down
2 changes: 1 addition & 1 deletion cmd/geth/dao_test.go → cmd/efsn/dao_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ func testDAOForkBlockNewChain(t *testing.T, test int, genesis string, expectBloc
geth.WaitExit()
}
// Retrieve the DAO config flag from the database
path := filepath.Join(datadir, "geth", "chaindata")
path := filepath.Join(datadir, "efsn", "chaindata")
db, err := ethdb.NewLDBDatabase(path, 0, 0)
if err != nil {
t.Fatalf("test %d: failed to open test database: %v", test, err)
Expand Down
File renamed without changes.
Loading

0 comments on commit 477dba1

Please sign in to comment.