From cef788042b48ec84c8884a7e5ad4ee4fb74acc9e Mon Sep 17 00:00:00 2001 From: frog power 4000 Date: Fri, 17 May 2019 19:45:36 -0400 Subject: [PATCH] Merge PR #4365: Simulator bugfix for multisim 7601778 --- .pending/bugfixes/sdk/4362-simulation-setu | 1 + cmd/gaia/contrib/runsim/main.go | 4 ++-- x/simulation/params.go | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 .pending/bugfixes/sdk/4362-simulation-setu diff --git a/.pending/bugfixes/sdk/4362-simulation-setu b/.pending/bugfixes/sdk/4362-simulation-setu new file mode 100644 index 0000000000..1235c31c06 --- /dev/null +++ b/.pending/bugfixes/sdk/4362-simulation-setu @@ -0,0 +1 @@ +#4362 simulation setup bugfix for multisim 7601778 \ No newline at end of file diff --git a/cmd/gaia/contrib/runsim/main.go b/cmd/gaia/contrib/runsim/main.go index aa64ac424c..092579dbc9 100644 --- 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 index 81bdd6e37f..12eb8e5959 100644 --- 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, }