aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/swarm
diff options
context:
space:
mode:
authorWei-Ning Huang <w@dexon.org>2018-10-24 18:59:48 +0800
committerWei-Ning Huang <w@dexon.org>2018-12-19 20:54:27 +0800
commit46de04d42cd3292bad26133a1d00905e342773dd (patch)
tree274cf9398e1e905235e7c464b1d75d8b78ef364c /cmd/swarm
parentedae2e0b2f898abfe64e4b7998103a8a67cce914 (diff)
downloaddexon-46de04d42cd3292bad26133a1d00905e342773dd.tar
dexon-46de04d42cd3292bad26133a1d00905e342773dd.tar.gz
dexon-46de04d42cd3292bad26133a1d00905e342773dd.tar.bz2
dexon-46de04d42cd3292bad26133a1d00905e342773dd.tar.lz
dexon-46de04d42cd3292bad26133a1d00905e342773dd.tar.xz
dexon-46de04d42cd3292bad26133a1d00905e342773dd.tar.zst
dexon-46de04d42cd3292bad26133a1d00905e342773dd.zip
Rename geth -> gdex and fix Dockerfile
Diffstat (limited to 'cmd/swarm')
-rw-r--r--cmd/swarm/config.go2
-rw-r--r--cmd/swarm/config_test.go12
-rw-r--r--cmd/swarm/main.go6
3 files changed, 10 insertions, 10 deletions
diff --git a/cmd/swarm/config.go b/cmd/swarm/config.go
index 0729e33f8..4925e3724 100644
--- a/cmd/swarm/config.go
+++ b/cmd/swarm/config.go
@@ -125,7 +125,7 @@ func initSwarmNode(config *bzzapi.Config, stack *node.Node, ctx *cli.Context) {
//at this point, all vars should be set in the Config
//get the account for the provided swarm account
prvkey := getAccount(config.BzzAccount, ctx, stack)
- //set the resolved config path (geth --datadir)
+ //set the resolved config path (gdex --datadir)
config.Path = expandPath(stack.InstanceDir())
//finally, initialize the configuration
config.Init(prvkey)
diff --git a/cmd/swarm/config_test.go b/cmd/swarm/config_test.go
index 6bc613274..17abb7c78 100644
--- a/cmd/swarm/config_test.go
+++ b/cmd/swarm/config_test.go
@@ -473,7 +473,7 @@ func TestConfigValidate(t *testing.T) {
}{
{
cfg: &api.Config{EnsAPIs: []string{
- "/data/testnet/geth.ipc",
+ "/data/testnet/gdex.ipc",
}},
},
{
@@ -488,7 +488,7 @@ func TestConfigValidate(t *testing.T) {
},
{
cfg: &api.Config{EnsAPIs: []string{
- "test:/data/testnet/geth.ipc",
+ "test:/data/testnet/gdex.ipc",
}},
},
{
@@ -498,7 +498,7 @@ func TestConfigValidate(t *testing.T) {
},
{
cfg: &api.Config{EnsAPIs: []string{
- "314159265dD8dbb310642f98f50C066173C1259b@/data/testnet/geth.ipc",
+ "314159265dD8dbb310642f98f50C066173C1259b@/data/testnet/gdex.ipc",
}},
},
{
@@ -513,7 +513,7 @@ func TestConfigValidate(t *testing.T) {
},
{
cfg: &api.Config{EnsAPIs: []string{
- "test:314159265dD8dbb310642f98f50C066173C1259b@/data/testnet/geth.ipc",
+ "test:314159265dD8dbb310642f98f50C066173C1259b@/data/testnet/gdex.ipc",
}},
},
{
@@ -546,9 +546,9 @@ func TestConfigValidate(t *testing.T) {
},
{
cfg: &api.Config{EnsAPIs: []string{
- "@/data/testnet/geth.ipc",
+ "@/data/testnet/gdex.ipc",
}},
- err: "invalid format [tld:][contract-addr@]url for ENS API endpoint configuration \"@/data/testnet/geth.ipc\": missing contract address",
+ err: "invalid format [tld:][contract-addr@]url for ENS API endpoint configuration \"@/data/testnet/gdex.ipc\": missing contract address",
},
} {
err := validateConfig(c.cfg)
diff --git a/cmd/swarm/main.go b/cmd/swarm/main.go
index 8b8af0c2b..fce5a5ce9 100644
--- a/cmd/swarm/main.go
+++ b/cmd/swarm/main.go
@@ -87,7 +87,7 @@ var defaultSubcommandHelp = cli.Command{
var defaultNodeConfig = node.DefaultConfig
-// This init function sets defaults so cmd/swarm can run alongside geth.
+// This init function sets defaults so cmd/swarm can run alongside gdex.
func init() {
defaultNodeConfig.Name = clientIdentifier
defaultNodeConfig.Version = sv.VersionWithCommit(gitCommit)
@@ -261,9 +261,9 @@ func bzzd(ctx *cli.Context) error {
//pss operates on ws
cfg.WSModules = append(cfg.WSModules, "pss")
- //geth only supports --datadir via command line
+ //gdex only supports --datadir via command line
//in order to be consistent within swarm, if we pass --datadir via environment variable
- //or via config file, we get the same directory for geth and swarm
+ //or via config file, we get the same directory for gdex and swarm
if _, err := os.Stat(bzzconfig.Path); err == nil {
cfg.DataDir = bzzconfig.Path
}