Simplify logic

Author: palango

core/vm/vmcontext/context.go

@@ -155,9 +155,7 @@ func TobinTransfer(evm *vm.EVM, sender, recipient common.Address, amount *big.In
 	}
 
 	// Only deduct tobin tax before the g hardfork
-	if evm.ChainConfig().IsGFork(evm.Context.BlockNumber) {
-		Transfer(evm.StateDB, sender, recipient, amount)
-	} else {
+	if !evm.ChainConfig().IsGFork(evm.Context.BlockNumber) {
 		if amount.Cmp(big.NewInt(0)) != 0 {
 			caller := &SharedEVMRunner{evm}
 			tax, taxRecipient, err := reserve.ComputeTobinTax(caller, sender, amount)
@@ -169,9 +167,8 @@ func TobinTransfer(evm *vm.EVM, sender, recipient common.Address, amount *big.In
 				log.Error("Failed to get tobin tax", "error", err)
 			}
 		}
-
-		// Complete a normal transfer if the amount is 0 or the tobin tax value is unable to be fetched and parsed.
-		// We transfer even when the amount is 0 because state trie clearing [EIP161] is necessary at the end of a transaction
-		Transfer(evm.StateDB, sender, recipient, amount)
 	}
+	// Complete a normal transfer if we're past the g fork, the amount is 0 or the tobin tax value is unable to be fetched and parsed.
+	// We transfer even when the amount is 0 because state trie clearing [EIP161] is necessary at the end of a transaction
+	Transfer(evm.StateDB, sender, recipient, amount)
 }