fix: name & test code for multi executor

contrib/launchtools/steps/genesis.go

@@ -334,7 +334,7 @@ func setOpChildBridgeExecutorAddress(cdc codec.Codec, genesisAppState map[string
 	error,
 ) {
 	opchildState := opchildtypes.GetGenesisStateFromAppState(cdc, genesisAppState)
-	opchildState.Params.BridgeExecutor = []string{bridgeExecutorAddr}
+	opchildState.Params.BridgeExecutors = []string{bridgeExecutorAddr}
 
 	return opchildState, nil
 }

proto/opinit/opchild/v1/types.proto

@@ -30,7 +30,7 @@ message Params {
   ];
   // the account address of bridge executor who can execute permissioned bridge
   // messages.
-  repeated string bridge_executor = 4 [
+  repeated string bridge_executors = 4 [
     (cosmos_proto.scalar)  = "cosmos.AddressString",
     (amino.dont_omitempty) = true,
     (gogoproto.moretags)   = "yaml:\"bridge_executor\""

x/opchild/client/cli/genesis.go

@@ -93,14 +93,14 @@ $ %s add-genesis-validator my-key-name --home=/path/to/home/dir --keyring-backen
 			}
 
 			allEmpty := true
-			for _, be := range opchildState.Params.BridgeExecutor {
+			for _, be := range opchildState.Params.BridgeExecutors {
 				if be != "" {
 					allEmpty = false
 					break
 				}
 			}
 			if allEmpty {
-				opchildState.Params.BridgeExecutor = []string{addr.String()}
+				opchildState.Params.BridgeExecutors = []string{addr.String()}
 			}
 
 			opchildGenStateBz, err := cdc.MarshalJSON(opchildState)

x/opchild/keeper/common_test.go

@@ -325,7 +325,7 @@ func _createTestInput(
 
 	opchildParams := opchildtypes.DefaultParams()
 	opchildParams.Admin = addrs[0].String()
-	opchildParams.BridgeExecutor = []string{addrs[0].String()}
+	opchildParams.BridgeExecutors = []string{addrs[0].String()}
 	require.NoError(t, opchildKeeper.SetParams(ctx, opchildParams))
 
 	// register handlers to msg router

x/opchild/keeper/executor_change.go

@@ -50,7 +50,7 @@ func (k Keeper) RegisterExecutorChangePlan(
 	k.ExecutorChangePlans[height] = types.ExecutorChangePlan{
 		ProposalID:    proposalID,
 		Height:        height,
-		NextExecutor:  nextExecutors,
+		NextExecutors: nextExecutors,
 		NextValidator: validator,
 		Info:          info,
 	}
@@ -76,7 +76,7 @@ func (k Keeper) ChangeExecutor(ctx context.Context, plan types.ExecutorChangePla
 	if err != nil {
 		return err
 	}
-	params.BridgeExecutor = plan.NextExecutor
+	params.BridgeExecutors = plan.NextExecutors
 	if err := k.SetParams(ctx, params); err != nil {
 		return err
 	}

x/opchild/keeper/executor_change_test.go

@@ -19,7 +19,7 @@ func Test_RegisterExecutorChangePlan(t *testing.T) {
 	l1ProposalID := uint64(rand.Uint64())
 	height := uint64(rand.Uint64())
 	nextValAddr := valAddrsStr[0]
-	nextExecutorAddr := []string{addrsStr[0]}
+	nextExecutorAddr := []string{addrsStr[0], addrsStr[1]}
 	consensusPubKey := "l7aqGv+Zjbm0rallfqfqz+3iN31iOmgJCafWV5pGs6o="
 	moniker := "moniker"
 	info := "info"
@@ -44,7 +44,7 @@ func Test_RegisterExecutorChangePlan(t *testing.T) {
 	require.Equal(t, types.ExecutorChangePlan{
 		ProposalID:    l1ProposalID,
 		Height:        height,
-		NextExecutor:  []string{addrsStr[0]},
+		NextExecutors: []string{addrsStr[0], addrsStr[1]},
 		NextValidator: expectedValidator,
 		Info:          info,
 	}, input.OPChildKeeper.ExecutorChangePlans[height])

x/opchild/keeper/msg_server.go

@@ -47,7 +47,7 @@ func (ms MsgServer) checkBridgeExecutorPermission(ctx context.Context, sender st
 		return err
 	}
 
-	bridgeExecutors, err := ms.BridgeExecutor(ctx)
+	bridgeExecutors, err := ms.BridgeExecutors(ctx)
 	if err != nil {
 		return err
 	}

x/opchild/keeper/msg_server_test.go

@@ -219,7 +219,7 @@ func Test_MsgServer_UpdateParams(t *testing.T) {
 	require.NoError(t, err)
 	params.MaxValidators = 1
 	params.HistoricalEntries = 1
-	params.BridgeExecutor = []string{addrs[1].String()}
+	params.BridgeExecutors = []string{addrs[1].String(), addrs[2].String()}
 
 	moduleAddr, err := input.AccountKeeper.AddressCodec().BytesToString(authtypes.NewModuleAddress(types.ModuleName))
 	require.NoError(t, err)

x/opchild/keeper/params.go

@@ -8,14 +8,14 @@ import (
 )
 
 // BridgeExecutor returns params.BridgeExecutor
-func (k Keeper) BridgeExecutor(ctx context.Context) ([]sdk.AccAddress, error) {
+func (k Keeper) BridgeExecutors(ctx context.Context) ([]sdk.AccAddress, error) {
 	params, err := k.GetParams(ctx)
 	if err != nil {
 		return nil, err
 	}
 	var addrs []sdk.AccAddress
 
-	for _, be := range params.BridgeExecutor {
+	for _, be := range params.BridgeExecutors {
 		addr, err := k.authKeeper.AddressCodec().StringToBytes(be)
 		if err != nil {
 			return nil, err

x/opchild/keeper/params_test.go

@@ -21,7 +21,7 @@ func Test_Params(t *testing.T) {
 	minGasPrices, err := input.OPChildKeeper.MinGasPrices(ctx)
 	require.NoError(t, err)
 	require.True(t, minGasPrices.Empty())
-	bridgeExecutor, err := input.OPChildKeeper.BridgeExecutor(ctx)
+	bridgeExecutor, err := input.OPChildKeeper.BridgeExecutors(ctx)
 	require.NoError(t, err)
 	require.Equal(t, []sdk.AccAddress{addrs[0]}, bridgeExecutor)
 

x/opchild/types/params.go

@@ -25,10 +25,10 @@ func DefaultParams() Params {
 }
 
 // NewParams creates a new Params instance
-func NewParams(admin string, bridgeExecutor []string, maxValidators, historicalEntries uint32, minGasPrice sdk.DecCoins, feeWhitelist []string) Params {
+func NewParams(admin string, bridgeExecutors []string, maxValidators, historicalEntries uint32, minGasPrice sdk.DecCoins, feeWhitelist []string) Params {
 	return Params{
 		Admin:             admin,
-		BridgeExecutor:    bridgeExecutor,
+		BridgeExecutors:   bridgeExecutors,
 		MaxValidators:     maxValidators,
 		HistoricalEntries: historicalEntries,
 		MinGasPrices:      minGasPrice,
@@ -50,7 +50,7 @@ func (p Params) Validate(ac address.Codec) error {
 	if _, err := ac.StringToBytes(p.Admin); err != nil {
 		return err
 	}
-	for _, be := range p.BridgeExecutor {
+	for _, be := range p.BridgeExecutors {
 		if _, err := ac.StringToBytes(be); err != nil {
 			return err
 		}

x/opchild/types/plan.go

@@ -8,7 +8,7 @@ type ExecutorChangePlan struct {
 	Height uint64
 
 	// Next executor addresses
-	NextExecutor []string
+	NextExecutors []string
 
 	// Next validator
 	NextValidator Validator