From 0eba41b9edd604d4b23f884f99ced620e3b70b40 Mon Sep 17 00:00:00 2001
From: ByoungGul Kwon <kwon528@iconloop.com>
Date: Mon, 31 Jul 2023 11:48:35 +0900
Subject: [PATCH] Clean up code in relay

---
 chain/ethbr/sender.go | 18 +++++++++---------
 chain/icon/sender.go  | 18 +++++++++---------
 common/link/link.go   | 12 +++++++-----
 3 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/chain/ethbr/sender.go b/chain/ethbr/sender.go
index a70ed0d..d983ff9 100644
--- a/chain/ethbr/sender.go
+++ b/chain/ethbr/sender.go
@@ -48,7 +48,7 @@ var (
 	txSizeLimit = int(math.Ceil(txMaxDataSize / (1 + txOverheadScale)))
 )
 
-type Queue struct {
+type queue struct {
 	values []*relayMessageTx
 }
 
@@ -57,12 +57,12 @@ type relayMessageTx struct {
 	txHash []byte
 }
 
-func NewQueue() *Queue {
-	queue := &Queue{}
+func newQueue() *queue {
+	queue := &queue{}
 	return queue
 }
 
-func (q *Queue) enqueue(id string, txHash []byte) error {
+func (q *queue) enqueue(id string, txHash []byte) error {
 	if MaxQueueSize <= len(q.values) {
 		return fmt.Errorf("queue full")
 	}
@@ -74,7 +74,7 @@ func (q *Queue) enqueue(id string, txHash []byte) error {
 	return nil
 }
 
-func (q *Queue) dequeue(id string) {
+func (q *queue) dequeue(id string) {
 	for i, rm := range q.values {
 		if rm.id == id {
 			q.values = q.values[i+1:]
@@ -83,11 +83,11 @@ func (q *Queue) dequeue(id string) {
 	}
 }
 
-func (q *Queue) isEmpty() bool {
+func (q *queue) isEmpty() bool {
 	return len(q.values) == 0
 }
 
-func (q *Queue) len() int {
+func (q *queue) len() int {
 	return len(q.values)
 }
 
@@ -102,7 +102,7 @@ type sender struct {
 	bmc                *binding.BMC
 	rr                 chan *btpTypes.RelayResult
 	isFoundOffsetBySeq bool
-	queue              *Queue
+	queue              *queue
 }
 
 func newSender(srcAddr btpTypes.BtpAddress, dstCfg link.ChainConfig, w btpTypes.Wallet, endpoint string, opt map[string]interface{}, l log.Logger) btpTypes.Sender {
@@ -112,7 +112,7 @@ func newSender(srcAddr btpTypes.BtpAddress, dstCfg link.ChainConfig, w btpTypes.
 		w:       w,
 		l:       l,
 		rr:      make(chan *btpTypes.RelayResult),
-		queue:   NewQueue(),
+		queue:   newQueue(),
 	}
 
 	b, err := json.Marshal(opt)
diff --git a/chain/icon/sender.go b/chain/icon/sender.go
index fb9b615..a5ce6d1 100644
--- a/chain/icon/sender.go
+++ b/chain/icon/sender.go
@@ -48,7 +48,7 @@ var (
 	txSizeLimit = int(math.Ceil(txMaxDataSize / (1 + txOverheadScale)))
 )
 
-type Queue struct {
+type queue struct {
 	values []*relayMessageTx
 }
 
@@ -57,12 +57,12 @@ type relayMessageTx struct {
 	txHash []byte
 }
 
-func NewQueue() *Queue {
-	queue := &Queue{}
+func newQueue() *queue {
+	queue := &queue{}
 	return queue
 }
 
-func (q *Queue) enqueue(id string, txHash []byte) error {
+func (q *queue) enqueue(id string, txHash []byte) error {
 	if MaxQueueSize <= len(q.values) {
 		return fmt.Errorf("queue full")
 	}
@@ -74,7 +74,7 @@ func (q *Queue) enqueue(id string, txHash []byte) error {
 	return nil
 }
 
-func (q *Queue) dequeue(id string) {
+func (q *queue) dequeue(id string) {
 	for i, rm := range q.values {
 		if rm.id == id {
 			q.values = q.values[i+1:]
@@ -83,11 +83,11 @@ func (q *Queue) dequeue(id string) {
 	}
 }
 
-func (q *Queue) isEmpty() bool {
+func (q *queue) isEmpty() bool {
 	return len(q.values) == 0
 }
 
-func (q *Queue) len() int {
+func (q *queue) len() int {
 	return len(q.values)
 }
 
@@ -102,7 +102,7 @@ type sender struct {
 	}
 	rr                 chan *types.RelayResult
 	isFoundOffsetBySeq bool
-	queue              *Queue
+	queue              *queue
 }
 
 func NewSender(srcAddr types.BtpAddress, dstCfg link.ChainConfig, w types.Wallet, endpoint string, opt map[string]interface{}, l log.Logger) types.Sender {
@@ -112,7 +112,7 @@ func NewSender(srcAddr types.BtpAddress, dstCfg link.ChainConfig, w types.Wallet
 		w:       w,
 		l:       l,
 		rr:      make(chan *types.RelayResult),
-		queue:   NewQueue(),
+		queue:   newQueue(),
 	}
 	b, err := json.Marshal(opt)
 	if err != nil {
diff --git a/common/link/link.go b/common/link/link.go
index 6c04f97..94e384a 100644
--- a/common/link/link.go
+++ b/common/link/link.go
@@ -221,8 +221,8 @@ func (l *Link) buildRelayMessage() error {
 func (l *Link) sendRelayMessage() error {
 	for _, rm := range l.rms {
 		if rm.sendingStatus == false {
-			l.l.Debugf("SendRelayMessage (bls height:%d, bls txSeq:%d, bls rxSeq:%d)",
-				rm.bls.Verifier.Height, rm.bls.TxSeq, rm.bls.RxSeq)
+			l.l.Debugf("SendRelayMessage (bls height:%d, bls rxSeq:%d)",
+				rm.bls.Verifier.Height, rm.bls.RxSeq)
 			_, err := l.s.Relay(rm)
 			if err != nil {
 				if errors.InvalidStateError.Equals(err) {
@@ -261,8 +261,8 @@ func (l *Link) appendRelayMessage() error {
 
 		rm.sendingStatus = false
 		l.rms = append(l.rms, rm)
-		l.l.Debugf("AppendRelayMessage (bls height:%d, bls txSeq:%d, bls rxSeq:%d)",
-			rm.bls.Verifier.Height, rm.bls.TxSeq, rm.bls.RxSeq)
+		l.l.Debugf("AppendRelayMessage (bls height:%d, bls rxSeq:%d)",
+			rm.bls.Verifier.Height, rm.bls.RxSeq)
 	}
 
 	l.rmi.rmis = l.rmi.rmis[:0]
@@ -564,7 +564,9 @@ func (l *Link) result(rr *types.RelayResult) error {
 			}
 		case errors.BMVRevertInvalidBlockWitnessOld:
 			//TODO Error handling required on Finalized
-			l.updateBlockProof(rr.Id)
+			if err := l.updateBlockProof(rr.Id); err != nil {
+				return err
+			}
 		default:
 			l.l.Panicf("fail to GetResult RelayMessage ID:%v ErrorCoder:%+v",
 				rr.Id, rr.Err)