minor changes

app/app.go

@@ -209,19 +209,18 @@ func (app *EthermintApplication) Query(query abciTypes.RequestQuery) abciTypes.R
 // validateTx checks the validity of a tx against the blockchain's current state.
 // it duplicates the logic in ethereum's tx_pool
 func (app *EthermintApplication) validateTx(tx *ethTypes.Transaction) abciTypes.Result {
-	currentState := app.checkTxState
-
-	var signer ethTypes.Signer = ethTypes.FrontierSigner{}
-	if tx.Protected() {
-		signer = ethTypes.NewEIP155Signer(tx.ChainId())
-	}
 
 	// Heuristic limit, reject transactions over 32KB to prevent DOS attacks
 	if tx.Size() > maxTransactionSize {
 		return abciTypes.ErrInternalError.
 			AppendLog(core.ErrOversizedData.Error())
 	}
 
+	var signer ethTypes.Signer = ethTypes.FrontierSigner{}
+	if tx.Protected() {
+		signer = ethTypes.NewEIP155Signer(tx.ChainId())
+	}
+
 	// Make sure the transaction is signed properly
 	from, err := ethTypes.Sender(signer, tx)
 	if err != nil {
@@ -236,8 +235,9 @@ func (app *EthermintApplication) validateTx(tx *ethTypes.Transaction) abciTypes.
 			AppendLog(core.ErrNegativeValue.Error())
 	}
 
-	// Make sure the account exist. Non existent accounts
-	// haven't got funds and well therefor never pass.
+	currentState := app.checkTxState
+
+	// Make sure the account exist - cant send from non-existing account.
 	if !currentState.Exist(from) {
 		return abciTypes.ErrBaseUnknownAddress.
 			AppendLog(core.ErrInvalidSender.Error())

app/app_test.go

@@ -46,8 +46,8 @@ func setupTestCase(t *testing.T, addresses []common.Address) (tearDown func(t *t
 
 	tearDown = func(t *testing.T) {
 		t.Log("Tearing down test case")
-		os.RemoveAll(temporaryDirectory)
 		node.Stop()
+		os.RemoveAll(temporaryDirectory)
 	}
 
 	return
@@ -61,15 +61,13 @@ func TestStrictlyIncrementingNonces(t *testing.T) {
 	defer teardownTestCase(t)
 
 	height := uint64(1)
-	nonceOne := uint64(0)
-	nonceTwo := uint64(1)
-	nonceThree := uint64(2)
 
-	tx1 := createTxBytes(t, privateKey, nonceOne,
+	// create txs with different nonces
+	tx1 := createTxBytes(t, privateKey, 0,
 		receiverAddress, amount, gasLimit, gasPrice, nil)
-	tx2 := createTxBytes(t, privateKey, nonceTwo,
+	tx2 := createTxBytes(t, privateKey, 1,
 		receiverAddress, amount, gasLimit, gasPrice, nil)
-	tx3 := createTxBytes(t, privateKey, nonceThree,
+	tx3 := createTxBytes(t, privateKey, 2,
 		receiverAddress, amount, gasLimit, gasPrice, nil)
 
 	assert.Equal(t, abciTypes.OK, app.CheckTx(tx1))