Cleanup all conf.GConf.IsTestMode

auxten · auxten · commit c098b330bff1 · 2019-03-26T17:44:26.000+08:00
diff --git a/cmd/cql-minerd/node.go b/cmd/cql-minerd/node.go
@@ -33,7 +33,7 @@ import (
 
 func initNode() (server *rpc.Server, err error) {
 	var masterKey []byte
-	if !conf.GConf.IsTestMode {
+	if !conf.GConf.UseTestMasterKey {
 		// read master key
 		fmt.Print("Type in Master key to continue: ")
 		masterKey, err = terminal.ReadPassword(syscall.Stdin)
diff --git a/cmd/cql-observer/node.go b/cmd/cql-observer/node.go
@@ -30,7 +30,7 @@ import (
 
 func initNode() (err error) {
 	var masterKey []byte
-	if !conf.GConf.IsTestMode {
+	if !conf.GConf.UseTestMasterKey {
 		fmt.Print("Type in Master key to continue:")
 		masterKey, err = terminal.ReadPassword(syscall.Stdin)
 		if err != nil {
diff --git a/cmd/cql-utils/confgen.go b/cmd/cql-utils/confgen.go
@@ -74,13 +74,16 @@ func runConfgen() {
 	testnetConfig.PrivateKeyFile = privateKeyFileName
 	testnetConfig.PubKeyStoreFile = publicKeystoreFileName
 	testnetConfig.ThisNodeID = cliNodeID
-	testnetConfig.KnownNodes = append(testnetConfig.KnownNodes, proto.Node{
+	if testnetConfig.KnownNodes == nil {
+		testnetConfig.KnownNodes = make([]proto.Node, 1)
+	}
+	testnetConfig.KnownNodes[0] = proto.Node{
 		ID:        cliNodeID,
 		Role:      proto.Client,
 		Addr:      "0.0.0.0:15151",
 		PublicKey: publicKey,
 		Nonce:     nonce.Nonce,
-	})
+	}
 
 	// Write config
 	out, err := yaml.Marshal(testnetConfig)
diff --git a/cmd/cqld/bootstrap.go b/cmd/cqld/bootstrap.go
@@ -47,7 +47,7 @@ func runNode(nodeID proto.NodeID, listenAddr string) (err error) {
 	}
 
 	var masterKey []byte
-	if !conf.GConf.IsTestMode {
+	if !conf.GConf.UseTestMasterKey {
 		// read master key
 		fmt.Print("Type in Master key to continue: ")
 		masterKey, err = terminal.ReadPassword(syscall.Stdin)
diff --git a/sqlchain/chain_test.go b/sqlchain/chain_test.go
@@ -206,14 +206,14 @@ func TestMultiChain(t *testing.T) {
 	}
 
 	conf.GConf = &conf.Config{
-		IsTestMode:      true,
-		GenerateKeyPair: false,
-		WorkingRoot:     testDataDir,
-		PubKeyStoreFile: "public.keystore",
-		PrivateKeyFile:  "private.key",
-		DHTFileName:     "dht.db",
-		ListenAddr:      bpsvr.Listener.Addr().String(),
-		ThisNodeID:      bpinfo.NodeID,
+		UseTestMasterKey: true,
+		GenerateKeyPair:  false,
+		WorkingRoot:      testDataDir,
+		PubKeyStoreFile:  "public.keystore",
+		PrivateKeyFile:   "private.key",
+		DHTFileName:      "dht.db",
+		ListenAddr:       bpsvr.Listener.Addr().String(),
+		ThisNodeID:       bpinfo.NodeID,
 		ValidDNSKeys: map[string]string{
 			"koPbw9wmYZ7ggcjnQ6ayHyhHaDNMYELKTqT+qRGrZpWSccr/lBcrm10Z1PuQHB3Azhii+sb0PYFkH1ruxLhe5g==": "cloudflare.com",
 			"mdsswUyr3DPW132mOi8V9xESWE8jTo0dxCjjnopKl+GqJxpVXckHAeF+KkxLbxILfDLUT0rAK9iUzy1L53eKGQ==": "cloudflare.com",
diff --git a/sqlchain/observer/config_test.go b/sqlchain/observer/config_test.go
@@ -57,7 +57,7 @@ func TestLoadConfig(t *testing.T) {
 		})
 		Convey("Given a config file without observer section", func() {
 			err = ioutil.WriteFile(fl, []byte(
-				`IsTestMode: true
+				`UseTestMasterKey: true
 WorkingRoot: "./"
 PubKeyStoreFile: "public.keystore"
 PrivateKeyFile: "private.key"
@@ -184,7 +184,7 @@ KnownNodes:
 		})
 		Convey("Given a full config file", func() {
 			err = ioutil.WriteFile(fl, []byte(
-				`IsTestMode: true
+				`UseTestMasterKey: true
 WorkingRoot: "./"
 PubKeyStoreFile: "public.keystore"
 PrivateKeyFile: "private.key"
diff --git a/test/integration/node_c/config.yaml b/test/integration/node_c/config.yaml
@@ -1,8 +1,4 @@
 UseTestMasterKey: true
-WorkingRoot: "./"
-PubKeyStoreFile: "public.keystore"
-PrivateKeyFile: "private.key"
-DHTFileName: "dht.db"
 ListenAddr: "127.0.0.1:3120"
 ThisNodeID: "00000f3b43288fe99831eb533ab77ec455d13e11fc38ec35a42d4edd17aa320d"
 
diff --git a/xenomint/mux_test.go b/xenomint/mux_test.go
@@ -79,7 +79,7 @@ func setupMuxParallel(priv *ca.PrivateKey) (
 	nis[2].Role = proto.Client
 	// Setup global config
 	conf.GConf = &conf.Config{
-		IsTestMode:          true,
+		UseTestMasterKey:    true,
 		GenerateKeyPair:     false,
 		MinNodeIDDifficulty: testingNonceDifficulty,
 		BP: &conf.BPInfo{

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ func runNode(nodeID proto.NodeID, listenAddr string) (err error) {`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`var masterKey []byte`
`50`		`- if !conf.GConf.IsTestMode {`
	`50`	`+ if !conf.GConf.UseTestMasterKey {`
`51`	`51`	`// read master key`
`52`	`52`	`fmt.Print("Type in Master key to continue: ")`
`53`	`53`	`masterKey, err = terminal.ReadPassword(syscall.Stdin)`