[cmd] Make rosetta variable names consistent

Signed-off-by: Daniel Van Der Maden <dvandermaden0@berkeley.edu>

cmd/harmony/config.go

@@ -100,8 +100,8 @@ type httpConfig struct {
 	Enabled        bool
 	IP             string
 	Port           int
-	EnabledRosetta bool
-	PortRosetta    int
+	RosettaEnabled bool
+	RosettaPort    int
 }
 
 type wsConfig struct {
@@ -239,8 +239,8 @@ func loadHarmonyConfig(file string) (harmonyConfig, error) {
 	}
 
 	// Correct for old config version load (port 0 is invalid anyways)
-	if config.HTTP.PortRosetta == 0 {
-		config.HTTP.PortRosetta = defaultConfig.HTTP.PortRosetta
+	if config.HTTP.RosettaPort == 0 {
+		config.HTTP.RosettaPort = defaultConfig.HTTP.RosettaPort
 	}
 	return config, nil
 }

cmd/harmony/config_test.go

@@ -96,7 +96,7 @@ func TestV1_0_0Config(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if config.HTTP.EnabledRosetta {
+	if config.HTTP.RosettaEnabled {
 		t.Errorf("Expected rosetta http server to be disabled when loading old config")
 	}
 	if config.Version != "1.0.0" {

cmd/harmony/default.go

@@ -24,10 +24,10 @@ var defaultConfig = harmonyConfig{
 	},
 	HTTP: httpConfig{
 		Enabled:        true,
-		EnabledRosetta: false,
+		RosettaEnabled: false,
 		IP:             "127.0.0.1",
 		Port:           nodeconfig.DefaultRPCPort,
-		PortRosetta:    nodeconfig.DefaultRosettaPort,
+		RosettaPort:    nodeconfig.DefaultRosettaPort,
 	},
 	WS: wsConfig{
 		Enabled: true,

cmd/harmony/flags.go

@@ -45,7 +45,7 @@ var (
 
 	httpFlags = []cli.Flag{
 		httpEnabledFlag,
-		httpEnabledRosettaFlag,
+		httpRosettaEnabledFlag,
 		httpIPFlag,
 		httpPortFlag,
 		httpRosettaPortFlag,
@@ -398,15 +398,15 @@ var (
 		Usage:    "rpc port to listen for HTTP requests",
 		DefValue: defaultConfig.HTTP.Port,
 	}
-	httpEnabledRosettaFlag = cli.BoolFlag{
+	httpRosettaEnabledFlag = cli.BoolFlag{
 		Name:     "http.rosetta",
 		Usage:    "enable HTTP / Rosetta requests",
-		DefValue: defaultConfig.HTTP.EnabledRosetta,
+		DefValue: defaultConfig.HTTP.RosettaEnabled,
 	}
 	httpRosettaPortFlag = cli.IntFlag{
 		Name:     "http.rosetta.port",
 		Usage:    "rosetta port to listen for HTTP requests",
-		DefValue: defaultConfig.HTTP.PortRosetta,
+		DefValue: defaultConfig.HTTP.RosettaPort,
 	}
 )
 
@@ -424,14 +424,14 @@ func applyHTTPFlags(cmd *cobra.Command, config *harmonyConfig) {
 	}
 
 	if cli.IsFlagChanged(cmd, httpRosettaPortFlag) {
-		config.HTTP.PortRosetta = cli.GetIntFlagValue(cmd, httpRosettaPortFlag)
+		config.HTTP.RosettaPort = cli.GetIntFlagValue(cmd, httpRosettaPortFlag)
 		isRosettaSpecified = true
 	}
 
-	if cli.IsFlagChanged(cmd, httpEnabledRosettaFlag) {
-		config.HTTP.EnabledRosetta = cli.GetBoolFlagValue(cmd, httpEnabledRosettaFlag)
+	if cli.IsFlagChanged(cmd, httpRosettaEnabledFlag) {
+		config.HTTP.RosettaEnabled = cli.GetBoolFlagValue(cmd, httpRosettaEnabledFlag)
 	} else if isRosettaSpecified {
-		config.HTTP.EnabledRosetta = true
+		config.HTTP.RosettaEnabled = true
 	}
 
 	if cli.IsFlagChanged(cmd, httpEnabledFlag) {
@@ -1052,7 +1052,7 @@ func applyLegacyMiscFlags(cmd *cobra.Command, config *harmonyConfig) {
 		legacyPort := cli.GetIntFlagValue(cmd, legacyPortFlag)
 		config.P2P.Port = legacyPort
 		config.HTTP.Port = nodeconfig.GetRPCHTTPPortFromBase(legacyPort)
-		config.HTTP.PortRosetta = nodeconfig.GetRosettaHTTPPortFromBase(legacyPort)
+		config.HTTP.RosettaPort = nodeconfig.GetRosettaHTTPPortFromBase(legacyPort)
 		config.WS.Port = nodeconfig.GetWSPortFromBase(legacyPort)
 	}
 

cmd/harmony/flags_test.go

@@ -57,8 +57,8 @@ func TestHarmonyFlags(t *testing.T) {
 					Enabled:        true,
 					IP:             "127.0.0.1",
 					Port:           9500,
-					EnabledRosetta: false,
-					PortRosetta:    9700,
+					RosettaEnabled: false,
+					RosettaPort:    9700,
 				},
 				WS: wsConfig{
 					Enabled: true,
@@ -327,50 +327,50 @@ func TestRPCFlags(t *testing.T) {
 			args: []string{"--http=false"},
 			expConfig: httpConfig{
 				Enabled:        false,
-				EnabledRosetta: false,
+				RosettaEnabled: false,
 				IP:             defaultConfig.HTTP.IP,
 				Port:           defaultConfig.HTTP.Port,
-				PortRosetta:    defaultConfig.HTTP.PortRosetta,
+				RosettaPort:    defaultConfig.HTTP.RosettaPort,
 			},
 		},
 		{
 			args: []string{"--http.ip", "8.8.8.8", "--http.port", "9001"},
 			expConfig: httpConfig{
 				Enabled:        true,
-				EnabledRosetta: false,
+				RosettaEnabled: false,
 				IP:             "8.8.8.8",
 				Port:           9001,
-				PortRosetta:    defaultConfig.HTTP.PortRosetta,
+				RosettaPort:    defaultConfig.HTTP.RosettaPort,
 			},
 		},
 		{
 			args: []string{"--http.ip", "8.8.8.8", "--http.port", "9001", "--http.rosetta.port", "10001"},
 			expConfig: httpConfig{
 				Enabled:        true,
-				EnabledRosetta: true,
+				RosettaEnabled: true,
 				IP:             "8.8.8.8",
 				Port:           9001,
-				PortRosetta:    10001,
+				RosettaPort:    10001,
 			},
 		},
 		{
 			args: []string{"--http.ip", "8.8.8.8", "--http.rosetta.port", "10001"},
 			expConfig: httpConfig{
 				Enabled:        true,
-				EnabledRosetta: true,
+				RosettaEnabled: true,
 				IP:             "8.8.8.8",
 				Port:           defaultConfig.HTTP.Port,
-				PortRosetta:    10001,
+				RosettaPort:    10001,
 			},
 		},
 		{
 			args: []string{"--ip", "8.8.8.8", "--port", "9001", "--public_rpc"},
 			expConfig: httpConfig{
 				Enabled:        true,
-				EnabledRosetta: false,
+				RosettaEnabled: false,
 				IP:             publicListenIP,
 				Port:           9501,
-				PortRosetta:    9701,
+				RosettaPort:    9701,
 			},
 		},
 	}

cmd/harmony/main.go

@@ -286,9 +286,9 @@ func setupNodeAndRun(hc harmonyConfig) {
 
 	// Parse rosetta config
 	nodeConfig.RosettaServer = nodeconfig.RosettaServerConfig{
-		HTTPEnabled: hc.HTTP.EnabledRosetta,
+		HTTPEnabled: hc.HTTP.RosettaEnabled,
 		HTTPIp:      hc.HTTP.IP,
-		HTTPPort:    hc.HTTP.PortRosetta,
+		HTTPPort:    hc.HTTP.RosettaPort,
 	}
 
 	if hc.Revert != nil && hc.Revert.RevertBefore != 0 && hc.Revert.RevertTo != 0 {