Merge pull request #360 from icon-project/bugfix/12-icon-bridge-planning-fix-error-message-use-context

use appropriate error message + use context in GetMedianGasPriceForBlock

Author: manishbista28

cmd/e2etest/chain/bsc/client.go

@@ -14,7 +14,7 @@ func NewClients(urls []string, l log.Logger) (cls []*Client, err error) {
 	for _, url := range urls {
 		clrpc, err := rpc.Dial(url)
 		if err != nil {
-			l.Errorf("failed to create hmny rpc client: url=%v, %v", url, err)
+			l.Errorf("failed to create bsc rpc client: url=%v, %v", url, err)
 			return nil, err
 		}
 		cleth := ethclient.NewClient(clrpc)

cmd/iconbridge/chain/bsc/client.go

@@ -21,13 +21,13 @@ func newClients(urls []string, bmc string, l log.Logger) (cls []*Client, bmcs []
 	for _, url := range urls {
 		clrpc, err := rpc.Dial(url)
 		if err != nil {
-			l.Errorf("failed to create hmny rpc client: url=%v, %v", url, err)
+			l.Errorf("failed to create bsc rpc client: url=%v, %v", url, err)
 			return nil, nil, err
 		}
 		cleth := ethclient.NewClient(clrpc)
 		clbmc, err := NewBMC(common.HexToAddress(bmc), cleth)
 		if err != nil {
-			l.Errorf("failed to create bmc binding to hmny ethclient: url=%v, %v", url, err)
+			l.Errorf("failed to create bmc binding to bsc ethclient: url=%v, %v", url, err)
 			return nil, nil, err
 		}
 		bmcs = append(bmcs, clbmc)
@@ -153,26 +153,26 @@ func (cl *Client) GetBlockReceipts(hash common.Hash) (types.Receipts, error) {
 	return receipts, nil
 }
 
-func (c *Client) GetMedianGasPriceForBlock() (gasPrice *big.Int, gasHeight *big.Int, err error) {
+func (c *Client) GetMedianGasPriceForBlock(ctx context.Context) (gasPrice *big.Int, gasHeight *big.Int, err error) {
 	gasPrice = big.NewInt(0)
-	header, err := c.eth.HeaderByNumber(context.TODO(), nil)
+	header, err := c.eth.HeaderByNumber(ctx, nil)
 	if err != nil {
 		err = errors.Wrapf(err, "GetHeaderByNumber(height:latest) Err: %v", err)
 		return
 	}
 	height := header.Number
-	txnCount, err := c.eth.TransactionCount(context.TODO(), header.Hash())
+	txnCount, err := c.eth.TransactionCount(ctx, header.Hash())
 	if err != nil {
 		err = errors.Wrapf(err, "GetTransactionCount(height:%v, headerHash: %v) Err: %v", height, header.Hash(), err)
 		return
 	} else if err == nil && txnCount == 0 {
 		return nil, nil, fmt.Errorf("TransactionCount is zero for height(%v, headerHash %v)", height, header.Hash())
 	}
-	// txnF, err := c.eth.TransactionInBlock(context.TODO(), header.Hash(), 0)
+	// txnF, err := c.eth.TransactionInBlock(ctx, header.Hash(), 0)
 	// if err != nil {
 	// 	return nil, errors.Wrapf(err, "GetTransactionInBlock(headerHash: %v, height: %v Index: %v) Err: %v", header.Hash(), height, 0, err)
 	// }
-	txnS, err := c.eth.TransactionInBlock(context.TODO(), header.Hash(), uint(math.Floor(float64(txnCount)/2)))
+	txnS, err := c.eth.TransactionInBlock(ctx, header.Hash(), uint(math.Floor(float64(txnCount)/2)))
 	if err != nil {
 		return nil, nil, errors.Wrapf(err, "GetTransactionInBlock(headerHash: %v, height: %v Index: %v) Err: %v", header.Hash(), height, txnCount-1, err)
 	}

cmd/iconbridge/chain/bsc/receiver_test.go

@@ -46,7 +46,7 @@ func TestMedianGasPrice(t *testing.T) {
 	cls, _, err := newClients([]string{url}, BSC_BMC_PERIPHERY, log.New())
 	require.NoError(t, err)
 
-	_, _, err = cls[0].GetMedianGasPriceForBlock()
+	_, _, err = cls[0].GetMedianGasPriceForBlock(context.Background())
 	require.NoError(t, err)
 }
 
@@ -61,7 +61,7 @@ func TestFilterLogs(t *testing.T) {
 	if recv == nil {
 		t.Fatal(errors.New("Receiver is nil"))
 	}
-	exists, err := recv.hasBTPMessage(context.TODO(), big.NewInt(BlockHeight))
+	exists, err := recv.hasBTPMessage(context.Background(), big.NewInt(BlockHeight))
 	require.NoError(t, err)
 	if !exists {
 		require.NoError(t, errors.New("Expected true"))

cmd/iconbridge/chain/bsc/sender.go

@@ -198,7 +198,7 @@ func (s *sender) Segment(
 		return nil, nil, err
 	}
 	cl, _ := s.jointClient()
-	gasPrice, gasHeight, err := cl.GetMedianGasPriceForBlock()
+	gasPrice, gasHeight, err := cl.GetMedianGasPriceForBlock(ctx)
 	if err != nil || gasPrice.Int64() == 0 {
 		s.log.Infof("GetMedianGasPriceForBlock(%v) Msg: %v. Using default value for gas price \n", gasHeight.String(), err)
 		gasPrice = s.prevGasPrice