akash: use testnet node for default

fixes #320
akash-network · Jul 30, 2018 · 38b90cd · 38b90cd
1 parent 452da9a
commit 38b90cd
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 8 deletions.
diff --git a/_integration/cmp/base.go b/_integration/cmp/base.go
@@ -23,8 +23,11 @@ func akashd(name string, args ...string) gx.Cmd {
 func akash_(root vars.Ref, name string, args ...string) gx.Cmd {
 	cmd := g.EXEC("akash-"+name,
 		"{{akash-path}}",
-		append([]string{"-d", root.Var()}, args...)...)
+		append([]string{"-d", root.Var()}, args...)...).
+		AddEnv("AKASH_NODE", "{{akash-node}}")
 
-	cmd.WithMeta(g.Require("akash-path", root.Name()))
+	cmd.WithMeta(g.
+		Require("akash-path", root.Name()).
+		Default("akash-node", "http://localhost:46657"))
 	return cmd
 }
diff --git a/_run/common.sh b/_run/common.sh
@@ -3,9 +3,11 @@ AKASH_ROOT=../..
 DATA_ROOT=data
 AKASH_DIR=$DATA_ROOT/client
 AKASHD_DIR=$DATA_ROOT/node
+DEFAULT_AKASH_NODE="http://localhost:46657"
 
 _akash() {
-  "$AKASH_ROOT/akash" -d "$AKASH_DIR" "$@"
+  AKASH_NODE="${AKASH_NODE:-$DEFAULT_AKASH_NODE}" \
+    "$AKASH_ROOT/akash" -d "$AKASH_DIR" "$@"
 }
 
 _akashd() {

diff --git a/_run/multi/env.sh b/_run/multi/env.sh
@@ -5,8 +5,7 @@ nodeuri(){
 }
 
 akash(){
-  export AKASH_NODE=$(nodeuri)
-  _akash "$@"
+  AKASH_NODE=$(nodeuri) _akash "$@"
 }
 
 akashd(){

diff --git a/_run/single/env.sh b/_run/single/env.sh
@@ -11,6 +11,6 @@ akashd() {
 }
 
 akash_provider() {
-  "$AKASH_ROOT/akash" -d "$PROVIDER_DIR" "$@"
+  AKASH_NODE="${AKASH_NODE:-$DEFAULT_AKASH_NODE}" \
+    "$AKASH_ROOT/akash" -d "$PROVIDER_DIR" "$@"
 }
-
diff --git a/cmd/akash/session/base.go b/cmd/akash/session/base.go
@@ -23,6 +23,7 @@ const (
 	defaultCodec    = "english"
 	defaultPassword = "0123456789"
 	defaultHost     = "localhost"
+	defaultNode     = "http://api.akashtest.net:80"
 )
 
 func SetupBaseCommand(cmd *cobra.Command) {

diff --git a/cmd/akash/session/flags.go b/cmd/akash/session/flags.go
@@ -10,7 +10,7 @@ import (
 )
 
 func AddFlagNode(cmd *cobra.Command, flags *pflag.FlagSet) {
-	flags.StringP(flagNode, "n", "http://localhost:46657", "node host")
+	flags.StringP(flagNode, "n", defaultNode, "node host")
 	viper.BindPFlag(flagNode, flags.Lookup(flagNode))
 }