Address remaining comments from cosmos#2690

Makefile

@@ -173,12 +173,7 @@ test_sim_gaia_fast:
 
 test_sim_gaia_import_export:
 	@echo "Running Gaia import/export simulation. This may take several minutes..."
-	@go test ./cmd/gaia/app -run TestGaiaImportExport -SimulationEnabled=true -SimulationNumBlocks=50 -SimulationBlockSize=200 -SimulationCommit=true -SimulationSeed=4 -v -timeout 24h
-	@go test ./cmd/gaia/app -run TestGaiaImportExport -SimulationEnabled=true -SimulationNumBlocks=50 -SimulationBlockSize=200 -SimulationCommit=true -SimulationSeed=11 -v -timeout 24h
-	@go test ./cmd/gaia/app -run TestGaiaImportExport -SimulationEnabled=true -SimulationNumBlocks=50 -SimulationBlockSize=200 -SimulationCommit=true -SimulationSeed=12 -v -timeout 24h
-	@go test ./cmd/gaia/app -run TestGaiaImportExport -SimulationEnabled=true -SimulationNumBlocks=50 -SimulationBlockSize=200 -SimulationCommit=true -SimulationSeed=13 -v -timeout 24h
-	@go test ./cmd/gaia/app -run TestGaiaImportExport -SimulationEnabled=true -SimulationNumBlocks=50 -SimulationBlockSize=200 -SimulationCommit=true -SimulationSeed=414 -v -timeout 24h
-	@go test ./cmd/gaia/app -run TestGaiaImportExport -SimulationEnabled=true -SimulationNumBlocks=50 -SimulationBlockSize=200 -SimulationCommit=true -SimulationSeed=4142 -v -timeout 24h
+	@bash scripts/import-export-sim.sh 50
 
 test_sim_gaia_multi_seed:
 	@echo "Running multi-seed Gaia simulation. This may take awhile!"

scripts/import-export-sim.sh

@@ -0,0 +1,54 @@
+#!/bin/bash
+
+seeds=(1 2 4 7 9 20 32 123 124 582 1893 2989 3012 4728 37827 981928 87821 891823782 989182 89182391 \
+11 22 44 77 99 2020 3232 123123 124124 582582 18931893 29892989 30123012 47284728 37827)
+blocks=$1
+
+echo "Running multi-seed import-export simulation with seeds ${seeds[@]}"
+echo "Running $blocks blocks per seed"
+echo "Edit scripts/import-export-sim.sh to add new seeds. Keeping parameters in the file makes failures easy to reproduce."
+echo "This script will kill all sub-simulations on SIGINT/SIGTERM (i.e. Ctrl-C)."
+
+trap 'kill $(jobs -pr)' SIGINT SIGTERM
+
+tmpdir=$(mktemp -d)
+echo "Using temporary log directory: $tmpdir"
+
+sim() {
+  seed=$1
+	echo "Running import/export Gaia simulation with seed $seed. This may take awhile!"
+  file="$tmpdir/gaia-simulation-seed-$seed-date-$(date -Iseconds -u).stdout"
+  echo "Writing stdout to $file..."
+  go test ./cmd/gaia/app -run TestGaiaImportExport -SimulationEnabled=true -SimulationNumBlocks=$blocks \
+    -SimulationBlockSize=200 -SimulationCommit=true -SimulationSeed=$seed -v -timeout 24h > $file
+}
+
+i=0
+pids=()
+for seed in ${seeds[@]}; do
+  sim $seed &
+  pids[${i}]=$!
+  i=$(($i+1))
+  sleep 10 # start in order, nicer logs
+done
+
+echo "Simulation processes spawned, waiting for completion..."
+
+code=0
+
+i=0
+for pid in ${pids[*]}; do
+  wait $pid
+  last=$?
+  seed=${seeds[${i}]}
+  if [ $last -ne 0 ]
+  then
+    echo "Import/export simulation with seed $seed failed!"
+    code=1
+  else
+    echo "Import/export simulation with seed $seed OK"
+  fi
+  i=$(($i+1))
+done
+
+exit $code

types/store.go

@@ -197,16 +197,17 @@ func DiffKVStores(a KVStore, b KVStore, prefixesToSkip [][]byte) (kvA cmn.KVPair
 			kvB = cmn.KVPair{Key: iterB.Key(), Value: iterB.Value()}
 			iterB.Next()
 		}
-		compareValue := true
+		if !bytes.Equal(kvA.Key, kvB.Key) {
+			return kvA, kvB, count, false
+		}
 		for _, prefix := range prefixesToSkip {
+			// Skip value comparision if we matched a prefix
 			if bytes.Equal(kvA.Key[:len(prefix)], prefix) {
-				compareValue = false
+				count++
+				continue
 			}
 		}
-		if !bytes.Equal(kvA.Key, kvB.Key) {
-			return kvA, kvB, count, false
-		}
-		if compareValue && !bytes.Equal(kvA.Value, kvB.Value) {
+		if !bytes.Equal(kvA.Value, kvB.Value) {
 			return kvA, kvB, count, false
 		}
 		count++

x/slashing/genesis.go

@@ -73,13 +73,13 @@ func ExportGenesis(ctx sdk.Context, keeper Keeper) (data GenesisState) {
 	keeper.iterateValidatorSigningInfos(ctx, func(address sdk.ConsAddress, info ValidatorSigningInfo) (stop bool) {
 		bechAddr := address.String()
 		signingInfos[bechAddr] = info
-		array := []MissedBlock{}
+		localMissedBlocks := []MissedBlock{}
 
 		keeper.iterateValidatorMissedBlockBitArray(ctx, address, func(index int64, missed bool) (stop bool) {
-			array = append(array, MissedBlock{index, missed})
+			localMissedBlocks = append(localMissedBlocks, MissedBlock{index, missed})
 			return false
 		})
-		missedBlocks[bechAddr] = array
+		missedBlocks[bechAddr] = localMissedBlocks
 
 		return false
 	})

x/slashing/signing_info.go

@@ -24,7 +24,6 @@ func (k Keeper) getValidatorSigningInfo(ctx sdk.Context, address sdk.ConsAddress
 func (k Keeper) iterateValidatorSigningInfos(ctx sdk.Context, handler func(address sdk.ConsAddress, info ValidatorSigningInfo) (stop bool)) {
 	store := ctx.KVStore(k.storeKey)
 	iter := sdk.KVStorePrefixIterator(store, ValidatorSigningInfoKey)
-	defer iter.Close()
 	for ; iter.Valid(); iter.Next() {
 		address := GetValidatorSigningInfoAddress(iter.Key())
 		var info ValidatorSigningInfo
@@ -33,6 +32,7 @@ func (k Keeper) iterateValidatorSigningInfos(ctx sdk.Context, handler func(addre
 			break
 		}
 	}
+	iter.Close()
 }
 
 // Stored by *validator* address (not operator address)