Introduce wait function to exit immediately on some signals

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

Author: abicky

core/channel.go

@@ -67,7 +67,9 @@ func CreateChannel(ctx context.Context, pathName string, src, dst *ProvableChain
 			}
 
 			logger.Warn("Retrying transaction...")
-			time.Sleep(5 * time.Second)
+			if err := wait(ctx, 5*time.Second); err != nil {
+				return err
+			}
 		}
 
 		select {

core/connection.go

@@ -75,7 +75,9 @@ func CreateConnection(ctx context.Context, pathName string, src, dst *ProvableCh
 			}
 
 			logger.Warn("Retrying transaction...")
-			time.Sleep(5 * time.Second)
+			if err := wait(ctx, 5*time.Second); err != nil {
+				return err
+			}
 		}
 
 		select {

core/send.go

@@ -38,7 +38,9 @@ func GetFinalizedMsgResult(ctx context.Context, chain ProvableChain, msgID MsgID
 			} else {
 				waitTime = avgBlockTime * time.Duration(msgHeight.GetRevisionHeight()-lfHeight.GetRevisionHeight())
 			}
-			time.Sleep(waitTime)
+			if err := wait(ctx, waitTime); err != nil {
+				return err
+			}
 			return fmt.Errorf("msg(id=%v) not finalied: msg.height(%v) > lfh.height(%v)", msgID, msgHeight, lfHeight)
 		}
 

core/service.go

@@ -96,7 +96,9 @@ func (srv *RelayService) Start(ctx context.Context) error {
 		})); err != nil {
 			return err
 		}
-		time.Sleep(srv.interval)
+		if err := wait(ctx, srv.interval); err != nil {
+			return err
+		}
 	}
 }
 

core/utils.go

@@ -1,10 +1,12 @@
 package core
 
 import (
+	"context"
 	"encoding/hex"
 	"fmt"
 	"strconv"
 	"strings"
+	"time"
 
 	abci "github.com/cometbft/cometbft/abci/types"
 	clienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types"
@@ -171,3 +173,17 @@ func strToUint64(s string) uint64 {
 	}
 	return uint64(v)
 }
+
+func wait(ctx context.Context, d time.Duration) error {
+	// NOTE: We can use time.After with Go 1.23 or later
+	// cf. https://pkg.go.dev/time@go1.23.0#After
+	t := time.NewTimer(d)
+	defer t.Stop()
+
+	select {
+	case <-ctx.Done():
+		return ctx.Err()
+	case <-t.C:
+		return nil
+	}
+}