Merge branch 'shawn/v2-imports' into shawn/ccv-migrations

shaspitz · shaspitz · commit 45d74c70ff6e · 2023-05-23T12:12:03.000-07:00
diff --git a/x/ccv/provider/types/proposal.go b/x/ccv/provider/types/proposal.go
@@ -14,9 +14,9 @@ import (
 )
 
 const (
-	ProposalTypeConsumerAddition = "ConsumerAddition"
-	ProposalTypeConsumerRemoval  = "ConsumerRemoval"
-	ProposalTypeEquivocation     = "Equivocation"
+	ProposalTypeConsumerAddition = "interchain_security.ccv.provider.v2.ConsumerAdditionProposal"
+	ProposalTypeConsumerRemoval  = "interchain_security.ccv.provider.v2.ConsumerRemovalProposal"
+	ProposalTypeEquivocation     = "interchain_security.ccv.provider.v2.EquivocationProposal"
 )
 
 var (

Original file line number	Diff line number	Diff line change
`@@ -14,9 +14,9 @@ import (`
`14`	`14`	`)`
`15`	`15`
`16`	`16`	`const (`
`17`		`- ProposalTypeConsumerAddition = "ConsumerAddition"`
`18`		`- ProposalTypeConsumerRemoval = "ConsumerRemoval"`
`19`		`- ProposalTypeEquivocation = "Equivocation"`
	`17`	`+ ProposalTypeConsumerAddition = "interchain_security.ccv.provider.v2.ConsumerAdditionProposal"`
	`18`	`+ ProposalTypeConsumerRemoval = "interchain_security.ccv.provider.v2.ConsumerRemovalProposal"`
	`19`	`+ ProposalTypeEquivocation = "interchain_security.ccv.provider.v2.EquivocationProposal"`
`20`	`20`	`)`
`21`	`21`
`22`	`22`	`var (`