ethclient: simplify error handling in TransactionReceipt (#28748)

rosenk · holiman · fjl · web-flow · commit e3eeb64c9424 · 2024-01-04T16:32:23.000+01:00
Co-authored-by: Martin HS &lt;martin@swende.se&gt;
Co-authored-by: Felix Lange &lt;fjl@twurst.com&gt;
diff --git a/ethclient/ethclient.go b/ethclient/ethclient.go
@@ -307,10 +307,8 @@ func (ec *Client) TransactionInBlock(ctx context.Context, blockHash common.Hash,
 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
-		}
+	if err == nil && r == nil {
+		return nil, ethereum.NotFound
 	}
 	return r, err
 }

Original file line number	Diff line number	Diff line change
`@@ -307,10 +307,8 @@ func (ec *Client) TransactionInBlock(ctx context.Context, blockHash common.Hash,`
`307`	`307`	`func (ec Client) TransactionReceipt(ctx context.Context, txHash common.Hash) (types.Receipt, error) {`
`308`	`308`	`var r *types.Receipt`
`309`	`309`	`err := ec.c.CallContext(ctx, &r, "eth_getTransactionReceipt", txHash)`
`310`		`- if err == nil {`
`311`		`- if r == nil {`
`312`		`- return nil, ethereum.NotFound`
`313`		`- }`
	`310`	`+ if err == nil && r == nil {`
	`311`	`+ return nil, ethereum.NotFound`
`314`	`312`	`}`
`315`	`313`	`return r, err`
`316`	`314`	`}`