fix test

iotexproject · Nov 24, 2023 · b3879b5 · b3879b5
1 parent 5640159
commit b3879b5
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/action/protocol/execution/protocol_test.go b/action/protocol/execution/protocol_test.go
@@ -106,6 +106,10 @@ type (
 	}
 )
 
+var (
+	fixedTime = time.Unix(genesis.Default.Timestamp, 0)
+)
+
 func (eb *ExpectedBalance) Balance() *big.Int {
 	balance, ok := new(big.Int).SetString(eb.RawBalance, 10)
 	if !ok {
@@ -352,7 +356,7 @@ func (sct *SmartContractTest) runExecutions(
 		}
 		hashes = append(hashes, selpHash)
 	}
-	blk, err := bc.MintNewBlock(time.Unix(1234567890, 0))
+	blk, err := bc.MintNewBlock(fixedTime)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -424,6 +428,7 @@ func (sct *SmartContractTest) prepareBlockchain(
 		cfg.Genesis.Blockchain.QuebecBlockHeight = 0
 		cfg.Genesis.Blockchain.RedseaBlockHeight = 0
 		cfg.Genesis.Blockchain.SumatraBlockHeight = 0
+		cfg.Genesis.ActionGasLimit = 10000000
 	}
 	for _, expectedBalance := range sct.InitBalances {
 		cfg.Genesis.InitBalanceMap[expectedBalance.Account] = expectedBalance.Balance().String()
@@ -472,7 +477,9 @@ func (sct *SmartContractTest) prepareBlockchain(
 	r.NoError(reward.Register(registry))
 
 	r.NotNil(bc)
-	execution := NewProtocol(dao.GetBlockHash, rewarding.DepositGasWithSGD, nil, func(u uint64) (time.Time, error) { return time.Time{}, nil })
+	execution := NewProtocol(dao.GetBlockHash, rewarding.DepositGasWithSGD, nil, func(h uint64) (time.Time, error) {
+		return fixedTime.Add(time.Duration(h) * 5 * time.Second), nil
+	})
 	r.NoError(execution.Register(registry))
 	r.NoError(bc.Start(ctx))
 

diff --git a/action/protocol/execution/testdata-shanghai/large-initcode.json b/action/protocol/execution/testdata-shanghai/large-initcode.json
diff --git a/action/protocol/execution/testdata-shanghai/push0.json b/action/protocol/execution/testdata-shanghai/push0.json
@@ -15,7 +15,7 @@
         "rawAmount": "0",
         "rawGasLimit": 5000000,
         "rawGasPrice": "0",
-        "rawExpectedGasConsumed": 111417,
+        "rawExpectedGasConsumed": 700391,
         "expectedStatus": 1,
         "expectedBalances": [],
         "comment": "deploy push0 contract"

diff --git a/action/protocol/execution/testdata-shanghai/send-eth.json b/action/protocol/execution/testdata-shanghai/send-eth.json
@@ -28,7 +28,7 @@
         "rawGasLimit": 1000000,
         "rawGasPrice": "0",
         "rawAccessList": [],
-        "rawExpectedGasConsumed": 61113,
+        "rawExpectedGasConsumed": 58613,
         "expectedStatus": 1,
         "expectedBalances": [{
             "account": "io1rc2d2de7rtuucalsqv4d9ng0h297t63w7wvlph",