Make Prover.NewLightDB cancellable

Signed-off-by: Takeshi Arabiki <takeshi.arabiki@datachain.jp>

Author: abicky

chains/tendermint/cmd/light.go

@@ -43,7 +43,7 @@ func initLightCmd(ctx *config.Context) *cobra.Command {
 			chain := c.Chain.(*tendermint.Chain)
 			prover := c.Prover.(*tendermint.Prover)
 
-			db, df, err := prover.NewLightDB()
+			db, df, err := prover.NewLightDB(cmd.Context())
 			if err != nil {
 				return err
 			}
@@ -98,7 +98,7 @@ func updateLightCmd(ctx *config.Context) *cobra.Command {
 			}
 			prover := c.Prover.(*tendermint.Prover)
 
-			bh, err := prover.GetLatestLightHeader()
+			bh, err := prover.GetLatestLightHeader(cmd.Context())
 			if err != nil {
 				return err
 			}
@@ -136,7 +136,7 @@ func lightHeaderCmd(ctx *config.Context) *cobra.Command {
 
 			switch len(args) {
 			case 1:
-				header, err = prover.GetLatestLightHeader()
+				header, err = prover.GetLatestLightHeader(cmd.Context())
 				if err != nil {
 					return err
 				}
@@ -148,7 +148,7 @@ func lightHeaderCmd(ctx *config.Context) *cobra.Command {
 				}
 
 				if height == 0 {
-					height, err = prover.GetLatestLightHeight()
+					height, err = prover.GetLatestLightHeight(cmd.Context())
 					if err != nil {
 						return err
 					}
@@ -158,7 +158,7 @@ func lightHeaderCmd(ctx *config.Context) *cobra.Command {
 					}
 				}
 
-				header, err = prover.GetLightSignedHeaderAtHeight(height)
+				header, err = prover.GetLightSignedHeaderAtHeight(cmd.Context(), height)
 				if err != nil {
 					return err
 				}

chains/tendermint/light.go

@@ -55,15 +55,15 @@ func (pr *Prover) LightHTTP() lightp.Provider {
 	return cl
 }
 
-func (pr *Prover) NewLightDB() (db *dbm.GoLevelDB, df func(), err error) {
+func (pr *Prover) NewLightDB(ctx context.Context) (db *dbm.GoLevelDB, df func(), err error) {
 	c := pr.chain
 	if err := retry.Do(func() error {
 		db, err = dbm.NewGoLevelDB(c.config.ChainId, lightDir(c.HomePath))
 		if err != nil {
 			return fmt.Errorf("can't open light client database: %w", err)
 		}
 		return nil
-	}, rtyAtt, rtyDel, rtyErr); err != nil {
+	}, rtyAtt, rtyDel, rtyErr, retry.Context(ctx)); err != nil {
 		return nil, nil, err
 	}
 
@@ -150,14 +150,14 @@ func (pr *Prover) LightClientWithoutTrust(ctx context.Context, db dbm.DB) (*ligh
 }
 
 // GetLatestLightHeader returns the header to be used for client creation
-func (pr *Prover) GetLatestLightHeader() (*tmclient.Header, error) {
-	return pr.GetLightSignedHeaderAtHeight(0)
+func (pr *Prover) GetLatestLightHeader(ctx context.Context) (*tmclient.Header, error) {
+	return pr.GetLightSignedHeaderAtHeight(ctx, 0)
 }
 
 // GetLightSignedHeaderAtHeight returns a signed header at a particular height.
-func (pr *Prover) GetLightSignedHeaderAtHeight(height int64) (*tmclient.Header, error) {
+func (pr *Prover) GetLightSignedHeaderAtHeight(ctx context.Context, height int64) (*tmclient.Header, error) {
 	// create database connection
-	db, df, err := pr.NewLightDB()
+	db, df, err := pr.NewLightDB(ctx)
 	if err != nil {
 		return nil, err
 	}

chains/tendermint/prover.go

@@ -183,8 +183,8 @@ func (pr *Prover) CheckRefreshRequired(ctx context.Context, counterparty core.Ch
 /* Local LightClient implementation */
 
 // GetLatestLightHeight uses the CLI utilities to pull the latest height from a given chain
-func (pr *Prover) GetLatestLightHeight() (int64, error) {
-	db, df, err := pr.NewLightDB()
+func (pr *Prover) GetLatestLightHeight(ctx context.Context) (int64, error) {
+	db, df, err := pr.NewLightDB(ctx)
 	if err != nil {
 		return -1, err
 	}
@@ -200,7 +200,7 @@ func (pr *Prover) GetLatestLightHeight() (int64, error) {
 
 func (pr *Prover) UpdateLightClient(ctx context.Context, height int64) (*tmclient.Header, error) {
 	// create database connection
-	db, df, err := pr.NewLightDB()
+	db, df, err := pr.NewLightDB(ctx)
 	if err != nil {
 		return nil, lightError(err)
 	}