feat: updating to cleaner interface and struct

Author: n2p5

app/provider/app.go

@@ -133,12 +133,15 @@ type AtomOneGovKeeper struct {
 }
 
 // GetProposal implements the AtomOne-style GetProposal method
-func (a *AtomOneGovKeeper) GetProposal(ctx sdk.Context, proposalID uint64) (ccvtypes.ProposalI, bool) {
+func (a *AtomOneGovKeeper) GetProposal(ctx sdk.Context, proposalID uint64) (ccvtypes.Proposal, bool) {
 	prop, err := a.keeper.Proposals.Get(ctx, proposalID)
 	if err != nil {
-		return nil, false
+		return ccvtypes.Proposal{}, false
 	}
-	return &prop, true
+	// Convert SDK proposal to ICS minimal proposal type
+	return ccvtypes.Proposal{
+		Messages: prop.Messages,
+	}, true
 }
 
 // AtomOneGovHooksWrapper wraps ICS provider hooks to work with standard SDK gov module

testutil/keeper/unit_test_helpers.go

@@ -82,9 +82,9 @@ func NewInMemKeeperParams(tb testing.TB) InMemKeeperParams {
 // TestGovKeeper is a mock implementation of GovKeeper for testing
 type TestGovKeeper struct{}
 
-// GetProposal returns nil - tests don't use actual proposals
-func (k TestGovKeeper) GetProposal(ctx sdk.Context, proposalID uint64) (types.ProposalI, bool) {
-	return nil, false
+// GetProposal returns an empty proposal - tests don't use actual proposals
+func (k TestGovKeeper) GetProposal(ctx sdk.Context, proposalID uint64) (types.Proposal, bool) {
+	return types.Proposal{}, false
 }
 
 // A struct holding pointers to any mocked external keeper needed for provider/consumer keeper setup.

x/ccv/types/expected_keepers.go

@@ -119,15 +119,21 @@ type ConsumerHooks interface {
 	AfterValidatorBonded(ctx context.Context, consAddr sdk.ConsAddress, valAddresses sdk.ValAddress) error
 }
 
-// ProposalI defines the minimal proposal interface needed by ICS
-type ProposalI interface {
-	GetMessages() []*codectypes.Any
+// Proposal defines the minimal proposal type needed by ICS
+// This is a simplified version that only contains the fields ICS actually uses
+type Proposal struct {
+	Messages []*codectypes.Any
+}
+
+// GetMessages returns the proposal messages
+func (p Proposal) GetMessages() []*codectypes.Any {
+	return p.Messages
 }
 
 // GovKeeper defines the expected interface for the governance keeper
 // Compatible with AtomOne's custom governance implementation
 type GovKeeper interface {
-	GetProposal(ctx sdk.Context, proposalID uint64) (ProposalI, bool)
+	GetProposal(ctx sdk.Context, proposalID uint64) (Proposal, bool)
 }
 
 // BankKeeper defines the expected interface needed to retrieve account balances.