From 250ecfc4d1350f535f10732b6332bfdfd7818904 Mon Sep 17 00:00:00 2001 From: Alex Sharov Date: Tue, 6 Jun 2023 16:50:04 +0700 Subject: [PATCH] Fix integration tests run3 (#7674) --- .github/workflows/test-integration.yml | 4 ++-- cmd/state/exec3/state.go | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml index 54f24775b..e2afd1a3d 100644 --- a/.github/workflows/test-integration.yml +++ b/.github/workflows/test-integration.yml @@ -29,8 +29,8 @@ jobs: - name: test-integration run: make test-integration -# - name: history-v3-test-integration -# run: make test3-integration + - name: history-v3-test-integration + run: make test3-integration tests-windows: strategy: diff --git a/cmd/state/exec3/state.go b/cmd/state/exec3/state.go index 0467e9536..6a179b71b 100644 --- a/cmd/state/exec3/state.go +++ b/cmd/state/exec3/state.go @@ -138,6 +138,10 @@ func (rw *Worker) RunTxTaskNoLock(txTask *exec22.TxTask) { header := txTask.Header switch { + case daoForkTx: + //fmt.Printf("txNum=%d, blockNum=%d, DAO fork\n", txTask.TxNum, txTask.BlockNum) + misc.ApplyDAOHardFork(ibs) + ibs.SoftFinalise() case txTask.TxIndex == -1: if txTask.BlockNum == 0 { // Genesis block @@ -179,10 +183,6 @@ func (rw *Worker) RunTxTaskNoLock(txTask *exec22.TxTask) { txTask.TraceTos[uncle.Coinbase] = struct{}{} } } - case daoForkTx: - //fmt.Printf("txNum=%d, blockNum=%d, DAO fork\n", txTask.TxNum, txTask.BlockNum) - misc.ApplyDAOHardFork(ibs) - ibs.SoftFinalise() default: //fmt.Printf("txNum=%d, blockNum=%d, txIndex=%d\n", txTask.TxNum, txTask.BlockNum, txTask.TxIndex) txHash := txTask.Tx.Hash()