Mass rename keymap -> keyassignment

cosmos · Nov 2, 2022 · 2410cf7 · 2410cf7
1 parent 2daab1e
commit 2410cf7
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git a/docs/keymap/README.md b/docs/keymap/README.md
@@ -107,4 +107,4 @@ The KeyAssignment implementation satisfies a number of internal properties, whic
 3. Pruning\
    'When the pruning method is used correctly, the internal state of the data structure does not grow unboundedly'
 
-Details can be found in x/ccv/provider/keeper/keymap_core_test.go. TODO: link?
+Details can be found in x/ccv/provider/keeper/keyassignment_core_test.go. TODO: link?
diff --git a/proto/interchain_security/ccv/provider/v1/genesis.proto b/proto/interchain_security/ccv/provider/v1/genesis.proto
@@ -9,7 +9,7 @@ import "interchain_security/ccv/v1/ccv.proto";
 import "interchain_security/ccv/provider/v1/provider.proto";
 import "interchain_security/ccv/consumer/v1/consumer.proto";
 import "interchain_security/ccv/consumer/v1/genesis.proto";
-import "interchain_security/ccv/provider/v1/keymap.proto";
+import "interchain_security/ccv/provider/v1/keyassignment.proto";
 
 // GenesisState defines the CCV provider chain genesis state
 message GenesisState {

diff --git a/proto/interchain_security/ccv/provider/v1/tx.proto b/proto/interchain_security/ccv/provider/v1/tx.proto
@@ -7,7 +7,7 @@ option go_package = "github.com/cosmos/interchain-security/x/ccv/provider/types"
 
 import "google/api/annotations.proto";
 import "gogoproto/gogo.proto";
-import "interchain_security/ccv/provider/v1/keymap.proto";
+import "interchain_security/ccv/provider/v1/keyassignment.proto";
 import "cosmos_proto/cosmos.proto";
 import "google/protobuf/any.proto";
 

diff --git a/tests/difference/core/driver/core_test.go b/tests/difference/core/driver/core_test.go
@@ -47,7 +47,7 @@ type CoreSuite struct {
 	offsetHeight        int64
 	offsetProviderVscId uint64
 
-	// Maps vscid to data needed to check keymapping
+	// Maps vscid to data needed to check keyassignmentping
 	vscidToKeyAssignment map[uint64]map[int64]providerkeeper.ConsumerPublicKey
 }
 

diff --git a/x/ccv/provider/keeper/keymap_api.tla b/x/ccv/provider/keeper/keymap_api.tla
@@ -1,4 +1,4 @@
----- MODULE keymap_api ----
+---- MODULE keyassignment_api ----
 
 EXTENDS  Integers, Naturals, FiniteSets, Sequences, TLC
 

diff --git a/x/ccv/provider/keeper/keymap_test.go b/x/ccv/provider/keeper/keymap_test.go
@@ -481,7 +481,7 @@ func getTrace(t *testing.T) []traceStep {
 	return ret
 }
 
-// go test -coverprofile=coverage.out -coverpkg=./... -timeout 1000m -run KeyAssignmentPropertiesRandomlyHeuristically keymap_test.go
+// go test -coverprofile=coverage.out -coverpkg=./... -timeout 1000m -run KeyAssignmentPropertiesRandomlyHeuristically keyassignment_test.go
 
 // Execute randomly generated traces (lists of actions)
 // against new instances of the class, checking properties

diff --git a/x/ccv/provider/keeper/relay.go b/x/ccv/provider/keeper/relay.go
@@ -41,7 +41,7 @@ func (k Keeper) OnRecvVSCMaturedPacket(
 		panic(fmt.Errorf("VSCMaturedPacket received on unknown channel %s", packet.DestinationChannel))
 	}
 
-	// It is now possible to delete keys from the keymap which the consumer chain
+	// It is now possible to delete keys from the keyassignment which the consumer chain
 	// is no longer able to reference in slash requests.
 	k.KeyAssignment(ctx, chainID).PruneUnusedKeys(data.ValsetUpdateId)
 
@@ -202,8 +202,8 @@ func (k Keeper) OnRecvSlashPacket(ctx sdk.Context, packet channeltypes.Packet, d
 }
 
 // TODO: should this be a panic or an error?
-func GetProviderConsAddr(keymap *KeyAssignment, consumerConsAddress sdk.ConsAddress) (sdk.ConsAddress, error) {
-	providerPublicKey, found := keymap.GetProviderPubKeyFromConsumerConsAddress(consumerConsAddress)
+func GetProviderConsAddr(keyassignment *KeyAssignment, consumerConsAddress sdk.ConsAddress) (sdk.ConsAddress, error) {
+	providerPublicKey, found := keyassignment.GetProviderPubKeyFromConsumerConsAddress(consumerConsAddress)
 	if !found {
 		return nil, errors.New("could not find provider address for slashing")
 	}

diff --git a/x/ccv/provider/types/consumer.go b/x/ccv/provider/types/consumer.go
@@ -15,7 +15,7 @@ func NewConsumerStates(
 	unbondingOpsIndexes []UnbondingOpIndex,
 	pendingValsetChanges []ccv.ValidatorSetChangePacketData,
 	slashDowntimeAck []string,
-	keymap *ccv.KeyAssignment,
+	keyassignment *ccv.KeyAssignment,
 ) ConsumerState {
 	return ConsumerState{
 		ChainId:                chainID,
@@ -27,6 +27,6 @@ func NewConsumerStates(
 		PendingValsetChanges:   pendingValsetChanges,
 		ConsumerGenesis:        genesis,
 		SlashDowntimeAck:       slashDowntimeAck,
-		KeyAssignment:          keymap,
+		KeyAssignment:          keyassignment,
 	}
 }