mirrors/tendermint
1
0
Fork 0
mirror of https://github.com/tendermint/tendermint.git synced 2026-09-01 05:37:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge latest changes from master and resolve conflicts

Browse Source 
Signed-off-by: Thane Thomson <connect@thanethomson.com>
This commit is contained in:
Thane Thomson
2022-03-24 08:03:42 -04:00
parent dfe82436a5 e4ae922c33
commit 040cb566fb
42 changed files with 1048 additions and 693 deletions
Download Patch File Download Diff File Expand all files Collapse all files
node/node_test.go
+1 -1
View File
@@ -754,7 +754,7 @@ func loadStatefromGenesis(ctx context.Context, t *testing.T) sm.State {
require.True(t, loadedState.IsEmpty())
valSet, _ := factory.ValidatorSet(ctx, t, 0, 10)
genDoc := factory.GenesisDoc(cfg, time.Now(), valSet.Validators, nil)
genDoc := factory.GenesisDoc(cfg, time.Now(), valSet.Validators, factory.ConsensusParams())
state, err := loadStateFromDBOrGenesisDocProvider(
stateStore,