From c4bff9684063ef9d32ef374478559ae125d53408 Mon Sep 17 00:00:00 2001 From: Rossen Krastev Date: Sat, 30 Dec 2023 00:30:53 +0200 Subject: [PATCH 1/4] improve error handling --- ethclient/ethclient.go | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/ethclient/ethclient.go b/ethclient/ethclient.go index e8a201f71b35..7a1c42f96e54 100644 --- a/ethclient/ethclient.go +++ b/ethclient/ethclient.go @@ -305,14 +305,15 @@ func (ec *Client) TransactionInBlock(ctx context.Context, blockHash common.Hash, // TransactionReceipt returns the receipt of a transaction by transaction hash. // Note that the receipt is not available for pending transactions. func (ec *Client) TransactionReceipt(ctx context.Context, txHash common.Hash) (*types.Receipt, error) { - var r *types.Receipt - err := ec.c.CallContext(ctx, &r, "eth_getTransactionReceipt", txHash) - if err == nil { - if r == nil { - return nil, ethereum.NotFound - } - } - return r, err + var r *types.Receipt + err := ec.c.CallContext(ctx, &r, "eth_getTransactionReceipt", txHash) + if err != nil { + return nil, err + } + if r == nil { + return nil, ethereum.NotFound + } + return r, nil } // SyncProgress retrieves the current progress of the sync algorithm. If there's From 853b07af34649e1dd266017f7a2f7b2daf5d939a Mon Sep 17 00:00:00 2001 From: Martin HS Date: Sat, 30 Dec 2023 17:09:43 +0100 Subject: [PATCH 2/4] Update ethclient/ethclient.go --- ethclient/ethclient.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ethclient/ethclient.go b/ethclient/ethclient.go index 7a1c42f96e54..7290bacc809c 100644 --- a/ethclient/ethclient.go +++ b/ethclient/ethclient.go @@ -306,8 +306,7 @@ func (ec *Client) TransactionInBlock(ctx context.Context, blockHash common.Hash, // Note that the receipt is not available for pending transactions. func (ec *Client) TransactionReceipt(ctx context.Context, txHash common.Hash) (*types.Receipt, error) { var r *types.Receipt - err := ec.c.CallContext(ctx, &r, "eth_getTransactionReceipt", txHash) - if err != nil { + if err := ec.c.CallContext(ctx, &r, "eth_getTransactionReceipt", txHash); err != nil { return nil, err } if r == nil { From 201e26cedbfb831b4fab0dea81ab12ff264094e1 Mon Sep 17 00:00:00 2001 From: Rossen Krastev Date: Sun, 31 Dec 2023 00:14:01 +0200 Subject: [PATCH 3/4] fix white spaces --- ethclient/ethclient.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ethclient/ethclient.go b/ethclient/ethclient.go index 7290bacc809c..f85e167c49b5 100644 --- a/ethclient/ethclient.go +++ b/ethclient/ethclient.go @@ -305,14 +305,14 @@ func (ec *Client) TransactionInBlock(ctx context.Context, blockHash common.Hash, // TransactionReceipt returns the receipt of a transaction by transaction hash. // Note that the receipt is not available for pending transactions. func (ec *Client) TransactionReceipt(ctx context.Context, txHash common.Hash) (*types.Receipt, error) { - var r *types.Receipt - if err := ec.c.CallContext(ctx, &r, "eth_getTransactionReceipt", txHash); err != nil { - return nil, err - } - if r == nil { - return nil, ethereum.NotFound - } - return r, nil + var r *types.Receipt + if err := ec.c.CallContext(ctx, &r, "eth_getTransactionReceipt", txHash); err != nil { + return nil, err + } + if r == nil { + return nil, ethereum.NotFound + } + return r, nil } // SyncProgress retrieves the current progress of the sync algorithm. If there's From 0924ae5d361ca19359c7ec016ac1fbc197b8aebc Mon Sep 17 00:00:00 2001 From: Felix Lange Date: Thu, 4 Jan 2024 14:53:04 +0100 Subject: [PATCH 4/4] Update ethclient.go --- ethclient/ethclient.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/ethclient/ethclient.go b/ethclient/ethclient.go index f85e167c49b5..900335988b28 100644 --- a/ethclient/ethclient.go +++ b/ethclient/ethclient.go @@ -306,13 +306,11 @@ func (ec *Client) TransactionInBlock(ctx context.Context, blockHash common.Hash, // Note that the receipt is not available for pending transactions. func (ec *Client) TransactionReceipt(ctx context.Context, txHash common.Hash) (*types.Receipt, error) { var r *types.Receipt - if err := ec.c.CallContext(ctx, &r, "eth_getTransactionReceipt", txHash); err != nil { - return nil, err - } - if r == nil { + err := ec.c.CallContext(ctx, &r, "eth_getTransactionReceipt", txHash) + if err == nil && r == nil { return nil, ethereum.NotFound } - return r, nil + return r, err } // SyncProgress retrieves the current progress of the sync algorithm. If there's