Recompile proto, all builds

cosmos · Oct 25, 2022 · 0755b73 · 0755b73
1 parent 7f52e59
commit 0755b73
Show file tree

Hide file tree

Showing 4 changed files with 102 additions and 422 deletions.
diff --git a/proto/interchain_security/ccv/provider/v1/keymap.proto b/proto/interchain_security/ccv/provider/v1/keymap.proto
@@ -19,20 +19,14 @@ message KeyToKey {
   tendermint.crypto.PublicKey to = 2;
 }
 
-message KeyToLastUpdateMemo {
-  tendermint.crypto.PublicKey key = 1;
-  LastUpdateMemo last_update_memo = 2;
-}
-
-message ConsAddrToKey {
+message ConsAddrToLastUpdateMemo {
   bytes cons_addr = 1;
-  tendermint.crypto.PublicKey key = 2;
+  LastUpdateMemo last_update_memo = 2;
 }
 
 message KeyMap {
   repeated KeyToKey pk_to_ck = 1 [ (gogoproto.nullable) = false ];
   repeated KeyToKey ck_to_pk = 2 [ (gogoproto.nullable) = false ];
-  repeated KeyToLastUpdateMemo ck_to_last_update_memo = 3
+  repeated ConsAddrToLastUpdateMemo cca_to_last_update_memo = 3
       [ (gogoproto.nullable) = false ];
-  repeated ConsAddrToKey cca_to_ck = 4 [ (gogoproto.nullable) = false ];
 }
diff --git a/x/ccv/provider/keeper/genesis.go b/x/ccv/provider/keeper/genesis.go
@@ -82,11 +82,8 @@ func (k Keeper) InitGenesis(ctx sdk.Context, genState *types.GenesisState) {
 			for _, ckToPk := range cs.KeyMap.CkToPk {
 				k.KeyMap(ctx, cs.ChainId).Store.SetCkToPk(*ckToPk.From, *ckToPk.To)
 			}
-			for _, ckToMemo := range cs.KeyMap.CkToLastUpdateMemo {
-				k.KeyMap(ctx, cs.ChainId).Store.SetCkToMemo(*ckToMemo.Key, *ckToMemo.LastUpdateMemo)
-			}
-			for _, ccaToCk := range cs.KeyMap.CcaToCk {
-				k.KeyMap(ctx, cs.ChainId).Store.SetCcaToCk(ccaToCk.ConsAddr, *ccaToCk.Key)
+			for _, ckToMemo := range cs.KeyMap.CcaToLastUpdateMemo {
+				k.KeyMap(ctx, cs.ChainId).Store.SetCkToMemo(ckToMemo.ConsAddr, *ckToMemo.LastUpdateMemo)
 			}
 		}
 	}
@@ -136,8 +133,7 @@ func (k Keeper) ExportGenesis(ctx sdk.Context) *types.GenesisState {
 			km := &ccv.KeyMap{}
 			km.PkToCk = []ccv.KeyToKey{}
 			km.CkToPk = []ccv.KeyToKey{}
-			km.CkToLastUpdateMemo = []ccv.KeyToLastUpdateMemo{}
-			km.CcaToCk = []ccv.ConsAddrToKey{}
+			km.CcaToLastUpdateMemo = []ccv.ConsAddrToLastUpdateMemo{}
 			k.KeyMap(ctx, chainID).Store.IteratePkToCk(func(pk ProviderPubKey, ck ConsumerPubKey) bool {
 				km.PkToCk = append(km.PkToCk, ccv.KeyToKey{From: &pk, To: &ck})
 				return false
@@ -146,14 +142,11 @@ func (k Keeper) ExportGenesis(ctx sdk.Context) *types.GenesisState {
 				km.CkToPk = append(km.CkToPk, ccv.KeyToKey{From: &ck, To: &pk})
 				return false
 			})
-			k.KeyMap(ctx, chainID).Store.IterateCkToMemo(func(ck ConsumerPubKey, m ccv.LastUpdateMemo) bool {
-				km.CkToLastUpdateMemo = append(km.CkToLastUpdateMemo, ccv.KeyToLastUpdateMemo{Key: &ck, LastUpdateMemo: &m})
-				return false
-			})
-			k.KeyMap(ctx, chainID).Store.IterateCcaToCk(func(cca ConsumerConsAddr, ck ConsumerPubKey) bool {
-				km.CcaToCk = append(km.CcaToCk, ccv.ConsAddrToKey{ConsAddr: cca, Key: &ck})
+			k.KeyMap(ctx, chainID).Store.IterateCkToMemo(func(ck ConsumerConsAddr, m ccv.LastUpdateMemo) bool {
+				km.CcaToLastUpdateMemo = append(km.CcaToLastUpdateMemo, ccv.ConsAddrToLastUpdateMemo{ConsAddr: ck, LastUpdateMemo: &m})
 				return false
 			})
+
 			return km
 		}
 

diff --git a/x/ccv/provider/keeper/genesis_test.go b/x/ccv/provider/keeper/genesis_test.go
@@ -11,7 +11,6 @@ import (
 	consumertypes "github.com/cosmos/interchain-security/x/ccv/consumer/types"
 	"github.com/cosmos/interchain-security/x/ccv/provider/keeper"
 	"github.com/cosmos/interchain-security/x/ccv/provider/types"
-	providertypes "github.com/cosmos/interchain-security/x/ccv/provider/types"
 	ccv "github.com/cosmos/interchain-security/x/ccv/types"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/require"
@@ -25,41 +24,39 @@ func TestIniAndExportGenesis(t *testing.T) {
 	oneHourFromNow := time.Now().UTC().Add(time.Hour)
 	initHeight, vscID := uint64(5), uint64(1)
 	ubdIndex := []uint64{0, 1, 2}
-	params := providertypes.DefaultParams()
+	params := types.DefaultParams()
 	keyMaps := []ccv.KeyMap{
 		{
-			PkToCk:             []ccv.KeyToKey{{From: &crypto.PublicKey{}, To: &crypto.PublicKey{}}},
-			CkToPk:             []ccv.KeyToKey{},
-			CkToLastUpdateMemo: []ccv.KeyToLastUpdateMemo{},
-			CcaToCk:            []ccv.ConsAddrToKey{},
+			PkToCk:              []ccv.KeyToKey{{From: &crypto.PublicKey{}, To: &crypto.PublicKey{}}},
+			CkToPk:              []ccv.KeyToKey{},
+			CcaToLastUpdateMemo: []ccv.ConsAddrToLastUpdateMemo{},
 		},
 		{
-			PkToCk:             []ccv.KeyToKey{},
-			CkToPk:             []ccv.KeyToKey{},
-			CkToLastUpdateMemo: []ccv.KeyToLastUpdateMemo{},
-			CcaToCk:            []ccv.ConsAddrToKey{},
+			PkToCk:              []ccv.KeyToKey{},
+			CkToPk:              []ccv.KeyToKey{},
+			CcaToLastUpdateMemo: []ccv.ConsAddrToLastUpdateMemo{},
 		},
 	}
 
 	// create genesis struct
-	pGenesis := providertypes.NewGenesisState(vscID,
-		[]providertypes.ValsetUpdateIdToHeight{{ValsetUpdateId: vscID, Height: initHeight}},
-		[]providertypes.ConsumerState{
-			providertypes.NewConsumerStates(
+	pGenesis := types.NewGenesisState(vscID,
+		[]types.ValsetUpdateIdToHeight{{ValsetUpdateId: vscID, Height: initHeight}},
+		[]types.ConsumerState{
+			types.NewConsumerStates(
 				cChainIDs[0],
 				expClientID,
 				"channel",
 				initHeight,
 				true,
 				*consumertypes.DefaultGenesisState(),
-				[]providertypes.UnbondingOpIndex{
+				[]types.UnbondingOpIndex{
 					{ValsetUpdateId: vscID, UnbondingOpIndex: ubdIndex},
 				},
 				nil,
 				[]string{"slashedValidatorConsAddress"},
 				&keyMaps[0],
 			),
-			providertypes.NewConsumerStates(
+			types.NewConsumerStates(
 				cChainIDs[1],
 				expClientID,
 				"",
@@ -77,11 +74,11 @@ func TestIniAndExportGenesis(t *testing.T) {
 			UnbondingConsumerChains: []string{cChainIDs[0]},
 		}},
 		&ccv.MaturedUnbondingOps{Ids: ubdIndex},
-		[]providertypes.ConsumerAdditionProposal{types.ConsumerAdditionProposal{
+		[]types.ConsumerAdditionProposal{types.ConsumerAdditionProposal{
 			ChainId:   cChainIDs[0],
 			SpawnTime: oneHourFromNow,
 		}},
-		[]providertypes.ConsumerRemovalProposal{types.ConsumerRemovalProposal{
+		[]types.ConsumerRemovalProposal{types.ConsumerRemovalProposal{
 			ChainId:  cChainIDs[0],
 			StopTime: oneHourFromNow,
 		}},
@@ -134,7 +131,7 @@ func TestIniAndExportGenesis(t *testing.T) {
 
 }
 
-func assertConsumerChainStates(ctx sdk.Context, t *testing.T, pk keeper.Keeper, consumerStates ...providertypes.ConsumerState) {
+func assertConsumerChainStates(ctx sdk.Context, t *testing.T, pk keeper.Keeper, consumerStates ...types.ConsumerState) {
 	for _, cs := range consumerStates {
 		chainID := cs.ChainId
 		gen, found := pk.GetConsumerGenesis(ctx, chainID)