forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-27 15:16:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'manav/fix-worker-test' into lmartins/upstream_merge_v1.14.10

Browse source
This commit is contained in:
Lucca Martins 2025-02-17 15:16:27 -03:00
commit 39968d1a98
No known key found for this signature in database
GPG key ID: DC3D7F76BDAE23BF
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
miner/worker_test.go
View file

@ -876,6 +876,9 @@ func TestCommitInterruptExperimentBor_NewTxFlow(t *testing.T) {
head := <-chainHeadCh head := <-chainHeadCh
// We skip the initial 2 blocks as the mining timings are a bit skewed up // We skip the initial 2 blocks as the mining timings are a bit skewed up
if head.Block.NumberU64() == 2 { if head.Block.NumberU64() == 2 {
// Wait until `w.current` is updated for next block (3)
time.Sleep(100 * time.Millisecond)
// Stop the miner so that worker assumes it's a sentry and not a validator // Stop the miner so that worker assumes it's a sentry and not a validator
w.stop() w.stop()

6
params/version.go
View file

@ -21,9 +21,9 @@ import (
) )
const ( const (
VersionMajor = 1 // Major version component of the current release VersionMajor = 2 // Major version component of the current release
VersionMinor = 5 // Minor version component of the current release VersionMinor = 0 // Minor version component of the current release
VersionPatch = 5 // Patch version component of the current release VersionPatch = 0 // Patch version component of the current release
VersionMeta = "" // Version metadata to append to the version string VersionMeta = "" // Version metadata to append to the version string
) )