fix test and speedup validation #3842
Conversation
Codecov Report
@@ Coverage Diff @@
## master #3842 +/- ##
=======================================
Coverage 75.38% 75.38%
=======================================
Files 303 303
Lines 25923 26014 +91
=======================================
+ Hits 19541 19610 +69
- Misses 5360 5379 +19
- Partials 1022 1025 +3
... and 1 file with indirect coverage changes 📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
dustinxie
force-pushed
the
master
branch
2 times, most recently
from
189d08d
to
2b01c59
Compare
| @@ -15,5 +15,5 @@ import ( | |||
| func TestTimestamp(t *testing.T) { | |||
| assert := assert.New(t) | |||
| time1 := TimestampNow() | |||
| assert.True(time.Now().After(time1)) | |||
| assert.False(time.Now().Before(time1)) | |||
There was a problem hiding this comment.
sometimes it happens that time.Now() == time1, causing CI test to fail
| @@ -110,7 +110,7 @@ type ( | |||
| CorrectGasRefund bool | |||
| FixRewardErroCheckPosition bool | |||
| EnableWeb3Rewarding bool | |||
| EnableNodeInfo bool | |||
| SkipSystemActionNonce bool | |||
There was a problem hiding this comment.
EnableNodeInfo is not used at all
| } else { | ||
| if err := ws.validateNonce(ctx, blk); err != nil { | ||
| return errors.Wrap(err, "failed to validate nonce") | ||
| } |
There was a problem hiding this comment.
block 1 has 2 tx, from the same sender io1vtm2zgn830pn6auc2cvnchgwdaefa9gr4z0s86, both with nonce=0, one is a transfer, the other is grant reward (system action)
validateNonce2() will ignore the grant reward, but return error for the transfer tx (since it's expecting nonce=1 but got nonce=0), so we have to keep the height check and 2 validate()
state/factory/workingset.go
Outdated
|
|
||
| // Special handling for genesis block | ||
| if blk.Height() == 0 { | ||
| return nil |
There was a problem hiding this comment.
duplicated with L338-L340, moved into checkNonceContinuity()?
There was a problem hiding this comment.
tested it's actually not needed
state/factory/workingset.go
Outdated
| return ws.checkNonceContinuity(ctx, accountNonceMap) | ||
| } | ||
|
|
||
| func (ws *workingSet) validateNonce2(ctx context.Context, blk *block.Block) error { |
There was a problem hiding this comment.
better name than validateNonce2?
|
Kudos, SonarCloud Quality Gate passed!
|
Description
backport haixiang's fix to master branch
Fixes #(issue)
Type of change
Please delete options that are not relevant.
How Has This Been Tested?
Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration
Test Configuration:
Checklist: