fix review

Signed-off-by: Daisuke Kanda <daisuke.kanda@datachain.jp>

Author: Daisuke Kanda

core/channel-upgrade.go

@@ -624,7 +624,7 @@ func upgradeChannelStep(ctx context.Context, src, dst *ProvableChain, targetSrcS
 			return err
 		}
 		return nil
-	})
+	}, rtyAtt, rtyDel, rtyErr, retry.Context(ctx))
 	if err != nil {
 		return nil, err
 	}

core/channel.go

@@ -215,8 +215,7 @@ func resolveCreateChannelFutureMsgs(
 			})
 		}
 		return eg.Wait()
-	}, rtyAtt, rtyDel, rtyErr, retry.Context(ctx), retry.OnRetry(func(n uint, err error) {
-	}))
+	}, rtyAtt, rtyDel, rtyErr, retry.Context(ctx))
 	if err != nil {
 		return nil, err
 	}

core/connection.go

@@ -247,8 +247,7 @@ func resolveCreateConnectionFutureMsgs(
 			})
 		}
 		return eg.Wait()
-	}, rtyAtt, rtyDel, rtyErr, retry.Context(ctx), retry.OnRetry(func(n uint, err error) {
-	}))
+	}, rtyAtt, rtyDel, rtyErr, retry.Context(ctx))
 	if err != nil {
 		return nil, err
 	}

core/naive-strategy.go

@@ -244,8 +244,7 @@ func (st *NaiveStrategy) RelayPackets(ctx context.Context, src, dst *ProvableCha
 		if num == 0 {
 			logger.InfoContext(ctx, "no packates to relay")
 		} else {
-			dir := fmt.Sprintf("%s->%s", fromChain.ChainID(), toChain.ChainID())
-			logPacketsRelayed(ctx, logger, num, "Packets", dir)
+			logPacketsRelayed(ctx, logger, num, "Packets")
 		}
 	}
 
@@ -407,12 +406,10 @@ func collectPackets(ctx QueryContext, chain *ProvableChain, packets PacketInfoLi
 	return msgs, nil
 }
 
-func logPacketsRelayed(ctx context.Context, logger *log.RelayLogger, num int, obj, dir string) {
+func logPacketsRelayed(ctx context.Context, logger *log.RelayLogger, num int, obj string) {
 	logger.InfoContext(ctx,
 		fmt.Sprintf("★ %s are scheduled for relay", obj),
-		"count", num,
-		"direction", dir,
-	)
+		"count", num)
 }
 
 func (st *NaiveStrategy) RelayAcknowledgements(ctx context.Context, src, dst *ProvableChain, isSrcToDst bool, packets PacketInfoList, sh SyncHeaders, doExecuteAck bool) ([]sdk.Msg, error) {
@@ -459,8 +456,7 @@ func (st *NaiveStrategy) RelayAcknowledgements(ctx context.Context, src, dst *Pr
 		if num == 0 {
 			logger.InfoContext(ctx, "no acknowledgements to relay")
 		} else {
-			dir := fmt.Sprintf("%s->%s", fromChain.ChainID(), toChain.ChainID())
-			logPacketsRelayed(ctx, logger, num, "Acknowledgements", dir)
+			logPacketsRelayed(ctx, logger, num, "Acknowledgements")
 		}
 	}