Merge PR #4365: Simulator bugfix for multisim 7601778

cosmos · May 17, 2019 · cef7880 · cef7880
1 parent fd9f322
commit cef7880
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/.pending/bugfixes/sdk/4362-simulation-setu b/.pending/bugfixes/sdk/4362-simulation-setu
@@ -0,0 +1 @@
+#4362 simulation setup bugfix for multisim 7601778
diff --git a/cmd/gaia/contrib/runsim/main.go b/cmd/gaia/contrib/runsim/main.go
@@ -25,7 +25,7 @@ var (
 		3012, 4728, 37827, 981928, 87821, 891823782,
 		989182, 89182391, 11, 22, 44, 77, 99, 2020,
 		3232, 123123, 124124, 582582, 18931893,
-		29892989, 30123012, 47284728,
+		29892989, 30123012, 47284728, 7601778,
 	}
 
 	// goroutine-safe process map
@@ -36,7 +36,7 @@ var (
 	results chan bool
 
 	// command line arguments and options
-	jobs       int = runtime.GOMAXPROCS(0)
+	jobs       = runtime.GOMAXPROCS(0)
 	blocks     string
 	period     string
 	testname   string

diff --git a/x/simulation/params.go b/x/simulation/params.go
@@ -134,7 +134,7 @@ func RandomParams(r *rand.Rand) Params {
 		PastEvidenceFraction:      r.Float64(),
 		NumKeys:                   RandIntBetween(r, 2, 250),
 		EvidenceFraction:          r.Float64(),
-		InitialLivenessWeightings: []int{r.Intn(80), r.Intn(10), r.Intn(10)},
+		InitialLivenessWeightings: []int{RandIntBetween(r, 1, 80), r.Intn(10), r.Intn(10)},
 		LivenessTransitionMatrix:  defaultLivenessTransitionMatrix,
 		BlockSizeTransitionMatrix: defaultBlockSizeTransitionMatrix,
 	}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		#4362 simulation setup bugfix for multisim 7601778