Merge branch 'main' into tuan/refactor-store

Author: TropicalDog17

cmd/rollkit/commands/run_node.go

@@ -58,7 +58,7 @@ func NewRunNodeCmd() *cobra.Command {
 				return err
 			}
 
-			// use aggregator by default
+			// use aggregator by default if the flag is not specified explicitly
 			if !cmd.Flags().Lookup("rollkit.aggregator").Changed {
 				nodeConfig.Aggregator = true
 			}

cmd/rollkit/commands/run_node_test.go

@@ -23,7 +23,7 @@ func TestParseFlags(t *testing.T) {
 		"--p2p.unconditional_peer_ids", "4,5,6",
 		"--priv_validator_laddr", "tcp://127.0.0.1:27003",
 		"--proxy_app", "tcp://127.0.0.1:27004",
-		"--rollkit.aggregator",
+		"--rollkit.aggregator=false",
 		"--rollkit.block_time", "2s",
 		"--rollkit.da_address", "http://127.0.0.1:27005",
 		"--rollkit.da_auth_token", "token",
@@ -46,6 +46,7 @@ func TestParseFlags(t *testing.T) {
 	args := append([]string{"start"}, flags...)
 
 	newRunNodeCmd := NewRunNodeCmd()
+
 	if err := newRunNodeCmd.ParseFlags(args); err != nil {
 		t.Errorf("Error: %v", err)
 	}
@@ -74,7 +75,7 @@ func TestParseFlags(t *testing.T) {
 		{"UnconditionalPeerIDs", config.P2P.UnconditionalPeerIDs, "4,5,6"},
 		{"PrivValidatorListenAddr", config.PrivValidatorListenAddr, "tcp://127.0.0.1:27003"},
 		{"ProxyApp", config.ProxyApp, "tcp://127.0.0.1:27004"},
-		{"Aggregator", nodeConfig.Aggregator, true},
+		{"Aggregator", nodeConfig.Aggregator, false},
 		{"BlockTime", nodeConfig.BlockTime, 2 * time.Second},
 		{"DAAddress", nodeConfig.DAAddress, "http://127.0.0.1:27005"},
 		{"DAAuthToken", nodeConfig.DAAuthToken, "token"},
@@ -102,3 +103,33 @@ func TestParseFlags(t *testing.T) {
 		})
 	}
 }
+
+func TestAggregatorFlagInvariants(t *testing.T) {
+	flagVariants := [][]string{{
+		"--rollkit.aggregator=false",
+	}, {
+		"--rollkit.aggregator=true",
+	}, {
+		"--rollkit.aggregator",
+	}}
+
+	validValues := []bool{false, true, true}
+
+	for i, flags := range flagVariants {
+		args := append([]string{"start"}, flags...)
+
+		newRunNodeCmd := NewRunNodeCmd()
+
+		if err := newRunNodeCmd.ParseFlags(args); err != nil {
+			t.Errorf("Error: %v", err)
+		}
+
+		if err := parseFlags(newRunNodeCmd); err != nil {
+			t.Errorf("Error: %v", err)
+		}
+
+		if nodeConfig.Aggregator != validValues[i] {
+			t.Errorf("Expected %v, got %v", validValues[i], nodeConfig.Aggregator)
+		}
+	}
+}

config/config.go

@@ -143,7 +143,8 @@ func (nc *NodeConfig) GetViperConfig(v *viper.Viper) error {
 // This function is called in cosmos-sdk.
 func AddFlags(cmd *cobra.Command) {
 	def := DefaultNodeConfig
-	cmd.Flags().Bool(FlagAggregator, def.Aggregator, "run node in aggregator mode")
+
+	cmd.Flags().BoolVar(&def.Aggregator, FlagAggregator, def.Aggregator, "run node in aggregator mode")
 	cmd.Flags().Bool(FlagLazyAggregator, def.LazyAggregator, "wait for transactions, don't build empty blocks")
 	cmd.Flags().String(FlagDAAddress, def.DAAddress, "DA address (host:port)")
 	cmd.Flags().String(FlagDAAuthToken, def.DAAuthToken, "DA auth token")

config/config_test.go

@@ -52,6 +52,7 @@ func TestViperAndCobra(t *testing.T) {
 	assert.NoError(cmd.Flags().Set(FlagDANamespace, "0102030405060708"))
 
 	nc := DefaultNodeConfig
+
 	assert.NoError(nc.GetViperConfig(v))
 
 	assert.Equal(true, nc.Aggregator)