simapp: avoid adding the mock client to AllowedClients if "*" is al…

…ready specified

Signed-off-by: Masanori Yoshida <[email protected]>

tests/chains/tendermint/simapp/app.go

@@ -852,9 +852,16 @@ func (app *SimApp) InitChainer(ctx sdk.Context, req *abci.RequestInitChain) (*ab
 		panic(err)
 	}
 
-	ibcGenesisState := ibctypes.DefaultGenesisState()
-	ibcGenesisState.ClientGenesis.Params.AllowedClients = append(ibcGenesisState.ClientGenesis.Params.AllowedClients, mockclienttypes.Mock)
-	genesisState[ibc.AppModule{}.Name()] = app.appCodec.MustMarshalJSON(ibcGenesisState)
+	{
+		var ibcGenesisState ibctypes.GenesisState
+		app.appCodec.MustUnmarshalJSON(genesisState[ibcexported.ModuleName], &ibcGenesisState)
+		if !ibcGenesisState.ClientGenesis.Params.IsAllowedClient(mockclienttypes.Mock) {
+			ibcGenesisState.ClientGenesis.Params.AllowedClients = append(
+				ibcGenesisState.ClientGenesis.Params.AllowedClients,
+				mockclienttypes.Mock)
+			genesisState[ibcexported.ModuleName] = app.appCodec.MustMarshalJSON(&ibcGenesisState)
+		}
+	}
 
 	if err := app.UpgradeKeeper.SetModuleVersionMap(ctx, app.ModuleManager.GetVersionMap()); err != nil {
 		panic(err)