WIP: Jae/simulator improvements

Gopkg.toml

@@ -32,11 +32,11 @@
 
 [[override]]
   name = "github.com/tendermint/iavl"
-  version = "=v0.11.1"
+  revision = "d8d0eef715649bcc21682990ac635566119f070c"
 
 [[override]]
   name = "github.com/tendermint/tendermint"
-  version = "v0.26.1"
+  revision = "70a7cae58c8f880aede3b19101e54fb9a7b08c0b"
 
 ## deps without releases:
 

Makefile

@@ -178,7 +178,7 @@ test_sim_gaia_nondeterminism:
 
 test_sim_gaia_fast:
 	@echo "Running quick Gaia simulation. This may take several minutes..."
-	@go test ./cmd/gaia/app -run TestFullGaiaSimulation -SimulationEnabled=true -SimulationNumBlocks=500 -SimulationBlockSize=200 -SimulationCommit=true -SimulationSeed=10 -v -timeout 24h
+	@go test ./cmd/gaia/app -run TestFullGaiaSimulation -SimulationEnabled=true -SimulationNumBlocks=500 -SimulationBlockSize=200 -SimulationCommit=true -SimulationSeed=99 -v -timeout 24h
 
 test_sim_gaia_import_export:
 	@echo "Running Gaia import/export simulation. This may take several minutes..."

baseapp/baseapp.go

@@ -56,6 +56,7 @@ type BaseApp struct {
 	endBlocker       sdk.EndBlocker   // logic to run after all txs, and to determine valset changes
 	addrPeerFilter   sdk.PeerFilter   // filter peers by address and port
 	pubkeyPeerFilter sdk.PeerFilter   // filter peers by public key
+	fauxMerkleMode   bool             // if true, IAVL MountStores uses MountStoresDB for simulation speed.
 
 	//--------------------
 	// Volatile
@@ -86,13 +87,14 @@ var _ abci.Application = (*BaseApp)(nil)
 // Accepts variable number of option functions, which act on the BaseApp to set configuration choices
 func NewBaseApp(name string, logger log.Logger, db dbm.DB, txDecoder sdk.TxDecoder, options ...func(*BaseApp)) *BaseApp {
 	app := &BaseApp{
-		Logger:      logger,
-		name:        name,
-		db:          db,
-		cms:         store.NewCommitMultiStore(db),
-		router:      NewRouter(),
-		queryRouter: NewQueryRouter(),
-		txDecoder:   txDecoder,
+		Logger:         logger,
+		name:           name,
+		db:             db,
+		cms:            store.NewCommitMultiStore(db),
+		router:         NewRouter(),
+		queryRouter:    NewQueryRouter(),
+		txDecoder:      txDecoder,
+		fauxMerkleMode: false,
 	}
 	for _, option := range options {
 		option(app)
@@ -111,10 +113,16 @@ func (app *BaseApp) SetCommitMultiStoreTracer(w io.Writer) {
 	app.cms.WithTracer(w)
 }
 
-// Mount IAVL stores to the provided keys in the BaseApp multistore
-func (app *BaseApp) MountStoresIAVL(keys ...*sdk.KVStoreKey) {
+// Mount IAVL or DB stores to the provided keys in the BaseApp multistore
+func (app *BaseApp) MountStores(keys ...*sdk.KVStoreKey) {
 	for _, key := range keys {
-		app.MountStore(key, sdk.StoreTypeIAVL)
+		if !app.fauxMerkleMode {
+			app.MountStore(key, sdk.StoreTypeIAVL)
+		} else {
+			// StoreTypeDB doesn't do anything upon commit, and it doesn't
+			// retain history, but it's useful for faster simulation.
+			app.MountStore(key, sdk.StoreTypeDB)
+		}
 	}
 }
 

baseapp/baseapp_test.go

@@ -60,7 +60,7 @@ func setupBaseApp(t *testing.T, options ...func(*BaseApp)) *BaseApp {
 		app.LoadLatestVersion(capKey1)
 	})
 
-	app.MountStoresIAVL(capKey1, capKey2)
+	app.MountStores(capKey1, capKey2)
 
 	// stores are mounted
 	err := app.LoadLatestVersion(capKey1)
@@ -91,7 +91,7 @@ func TestLoadVersion(t *testing.T) {
 
 	// make a cap key and mount the store
 	capKey := sdk.NewKVStoreKey("main")
-	app.MountStoresIAVL(capKey)
+	app.MountStores(capKey)
 	err := app.LoadLatestVersion(capKey) // needed to make stores non-nil
 	require.Nil(t, err)
 
@@ -117,15 +117,15 @@ func TestLoadVersion(t *testing.T) {
 
 	// reload with LoadLatestVersion
 	app = NewBaseApp(name, logger, db, nil)
-	app.MountStoresIAVL(capKey)
+	app.MountStores(capKey)
 	err = app.LoadLatestVersion(capKey)
 	require.Nil(t, err)
 	testLoadVersionHelper(t, app, int64(2), commitID2)
 
 	// reload with LoadVersion, see if you can commit the same block and get
 	// the same result
 	app = NewBaseApp(name, logger, db, nil)
-	app.MountStoresIAVL(capKey)
+	app.MountStores(capKey)
 	err = app.LoadVersion(1, capKey)
 	require.Nil(t, err)
 	testLoadVersionHelper(t, app, int64(1), commitID1)
@@ -161,7 +161,7 @@ func testChangeNameHelper(name string) func(*BaseApp) {
 
 	// make a cap key and mount the store
 	capKey := sdk.NewKVStoreKey("main")
-	app.MountStoresIAVL(capKey)
+	app.MountStores(capKey)
 	err := app.LoadLatestVersion(capKey) // needed to make stores non-nil
 	require.Nil(t, err)
 
@@ -219,7 +219,7 @@ func TestInitChainer(t *testing.T) {
 	app := NewBaseApp(name, logger, db, nil)
 	capKey := sdk.NewKVStoreKey("main")
 	capKey2 := sdk.NewKVStoreKey("key2")
-	app.MountStoresIAVL(capKey, capKey2)
+	app.MountStores(capKey, capKey2)
 
 	// set a value in the store on init chain
 	key, value := []byte("hello"), []byte("goodbye")
@@ -262,7 +262,7 @@ func TestInitChainer(t *testing.T) {
 	// reload app
 	app = NewBaseApp(name, logger, db, nil)
 	app.SetInitChainer(initChainer)
-	app.MountStoresIAVL(capKey, capKey2)
+	app.MountStores(capKey, capKey2)
 	err = app.LoadLatestVersion(capKey) // needed to make stores non-nil
 	require.Nil(t, err)
 

baseapp/options.go

@@ -102,6 +102,16 @@ func (app *BaseApp) SetPubKeyPeerFilter(pf sdk.PeerFilter) {
 	app.pubkeyPeerFilter = pf
 }
 
+func (app *BaseApp) SetFauxMerkleMode() {
+	if app.sealed {
+		panic("SetFauxMerkleMode() on sealed BaseApp")
+	}
+	app.fauxMerkleMode = true
+}
+
+//----------------------------------------
+// TODO: move these out of this file?
+
 func (app *BaseApp) Router() Router {
 	if app.sealed {
 		panic("Router() on sealed BaseApp")