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

…14.10
maticnetwork · Feb 17, 2025 · 39968d1 · 39968d1
2 parents f19812f + baea4af
commit 39968d1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/miner/worker_test.go b/miner/worker_test.go
@@ -876,6 +876,9 @@ func TestCommitInterruptExperimentBor_NewTxFlow(t *testing.T) {
 			head := <-chainHeadCh
 			// We skip the initial 2 blocks as the mining timings are a bit skewed up
 			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
 				w.stop()
 

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