fix conflict

cosmos · Sep 26, 2024 · c2d5333 · c2d5333
1 parent 76c6bb6
commit c2d5333
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/x/simulation/simulate.go b/x/simulation/simulate.go
@@ -107,7 +107,7 @@ func SimulateFromSeed(
 	nextValidators := validators
 	if len(nextValidators) == 0 {
 		tb.Skip("skipping: empty validator set in genesis")
-		return params, accs, nil
+		return true, params, nil
 	}
 
 	var (
@@ -249,7 +249,7 @@ func SimulateFromSeed(
 		nextValidators = updateValidators(tb, r, params, validators, res.ValidatorUpdates, eventStats.Tally)
 		if len(nextValidators) == 0 {
 			tb.Skip("skipping: empty validator set")
-			return exportedParams, accs, err
+			return true, params, nil
 		}
 
 		// update the exported params