From 6c0f4cbd744205b7931f4ebd7ae706f061a92ca6 Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Fri, 17 Feb 2023 11:18:51 -0800
Subject: [PATCH] nit: actually, don't use blocks

---
 node/impl/full/eth.go | 33 ++++++++++++++-------------------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/node/impl/full/eth.go b/node/impl/full/eth.go
index f0df89bff..0141f6a56 100644
--- a/node/impl/full/eth.go
+++ b/node/impl/full/eth.go
@@ -369,28 +369,23 @@ func (a *EthModule) EthGetTransactionCount(ctx context.Context, sender ethtypes.
 	}
 
 	// First, handle the case where the "sender" is an EVM actor.
-	{
-		actor, err := a.StateManager.LoadActor(ctx, addr, ts)
+	if actor, err := a.StateManager.LoadActor(ctx, addr, ts); err != nil {
+		if xerrors.Is(err, types.ErrActorNotFound) {
+			return 0, nil
+		}
+		return 0, xerrors.Errorf("failed to lookup contract %s: %w", sender, err)
+	} else if builtinactors.IsEvmActor(actor.Code) {
+		evmState, err := builtinevm.Load(a.Chain.ActorStore(ctx), actor)
 		if err != nil {
-			if xerrors.Is(err, types.ErrActorNotFound) {
-				return 0, nil
-			}
-			return 0, xerrors.Errorf("failed to lookup contract %s: %w", sender, err)
+			return 0, xerrors.Errorf("failed to load evm state: %w", err)
 		}
-
-		if builtinactors.IsEvmActor(actor.Code) {
-			evmState, err := builtinevm.Load(a.Chain.ActorStore(ctx), actor)
-			if err != nil {
-				return 0, xerrors.Errorf("failed to load evm state: %w", err)
-			}
-			if alive, err := evmState.IsAlive(); err != nil {
-				return 0, err
-			} else if !alive {
-				return 0, nil
-			}
-			nonce, err := evmState.Nonce()
-			return ethtypes.EthUint64(nonce), err
+		if alive, err := evmState.IsAlive(); err != nil {
+			return 0, err
+		} else if !alive {
+			return 0, nil
 		}
+		nonce, err := evmState.Nonce()
+		return ethtypes.EthUint64(nonce), err
 	}
 
 	nonce, err := a.Mpool.GetNonce(ctx, addr, ts.Key())