use *uint64 as argument type for GetFinalizedHeader instead of `exp…

…orted.Height` Signed-off-by: Masanori Yoshida <[email protected]>
hyperledger-labs · Nov 9, 2023 · 374258c · 374258c
1 parent f12dcdf
commit 374258c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/chains/tendermint/prover.go b/chains/tendermint/prover.go
@@ -13,7 +13,6 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types"
 	ibcclient "github.com/cosmos/ibc-go/v7/modules/core/client"
-	"github.com/cosmos/ibc-go/v7/modules/core/exported"
 	ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported"
 	tmclient "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint"
 
@@ -110,11 +109,11 @@ func (pr *Prover) SetupHeadersForUpdate(counterparty core.FinalityAwareChain, la
 }
 
 // GetFinalizedHeader returns the finalized header at `height`
-func (pr *Prover) GetFinalizedHeader(height exported.Height) (core.Header, error) {
-	if height == nil || height.IsZero() {
+func (pr *Prover) GetFinalizedHeader(height *uint64) (core.Header, error) {
+	if height == nil {
 		return pr.UpdateLightClient(0)
 	} else {
-		return pr.UpdateLightClient(int64(height.GetRevisionHeight()))
+		return pr.UpdateLightClient(int64(*height))
 	}
 }
 

diff --git a/core/provers.go b/core/provers.go
@@ -7,7 +7,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types"
-	"github.com/cosmos/ibc-go/v7/modules/core/exported"
 )
 
 // Prover represents a prover that supports generating a commitment proof
@@ -50,9 +49,9 @@ type LightClient interface {
 // FinalityAware provides the capability to determine the finality of the chain
 type FinalityAware interface {
 	// GetFinalizedHeader returns the finalized header on this chain corresponding to `height`.
-	// If `height` is nil or zero, this function returns the latest finalized header.
+	// If `height` is nil, this function returns the latest finalized header.
 	// If the header at `height` isn't finalized yet, this function returns an error.
-	GetFinalizedHeader(height exported.Height) (Header, error)
+	GetFinalizedHeader(height *uint64) (Header, error)
 }
 
 // FinalityAwareChain is FinalityAware + Chain

diff --git a/provers/mock/prover.go b/provers/mock/prover.go
@@ -90,15 +90,16 @@ func (pr *Prover) getDelayedLatestFinalizedHeight() (exported.Height, error) {
 }
 
 // GetFinalizedHeader returns the finalized header at `height`
-func (pr *Prover) GetFinalizedHeader(height exported.Height) (core.Header, error) {
+func (pr *Prover) GetFinalizedHeader(height *uint64) (core.Header, error) {
 	if latestFinalizedHeight, err := pr.getDelayedLatestFinalizedHeight(); err != nil {
 		return nil, err
-	} else if height == nil || height.IsZero() {
+	} else if height == nil {
 		return pr.createMockHeader(latestFinalizedHeight)
-	} else if height.GT(latestFinalizedHeight) {
-		return nil, fmt.Errorf("the requested height is greater than the latest finalized height: %v > %v", height, latestFinalizedHeight)
+	} else if *height > latestFinalizedHeight.GetRevisionHeight() {
+		return nil, fmt.Errorf("the requested height is greater than the latest finalized height: %v > %v", *height, latestFinalizedHeight)
 	} else {
-		return pr.createMockHeader(height)
+		ics02Height := clienttypes.NewHeight(latestFinalizedHeight.GetRevisionNumber(), *height)
+		return pr.createMockHeader(ics02Height)
 	}
 }