Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tendermint: update to rc3 #6892

Merged
merged 37 commits into from
Aug 14, 2020
Merged

tendermint: update to rc3 #6892

Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
554a0cf
modify light imports
tac0turtle Jul 30, 2020
d3534f0
change abci.header to tmproto.header
tac0turtle Jul 30, 2020
49aea06
Merge branch 'master' into tm_update_1
tac0turtle Jul 30, 2020
f781527
use rc
tac0turtle Jul 30, 2020
11d3f78
rc
tac0turtle Jul 30, 2020
f98e70a
fix import
tac0turtle Jul 30, 2020
03052b4
Merge branch 'master' into tm_update_1
tac0turtle Jul 30, 2020
dc9b87a
Merge branch 'master' into tm_update_1
alexanderbez Jul 30, 2020
331ba70
Merge PR #6893: fix key imports
tac0turtle Jul 30, 2020
96d8a51
fix rc2
tac0turtle Jul 30, 2020
660ca11
Merge branch 'master' into tm_update_1
tac0turtle Jul 30, 2020
e1d04b7
Merge branch 'master' into tm_update_1
fedekunze Jul 30, 2020
0dcc665
tendermint: update 3 (#6899)
tac0turtle Jul 30, 2020
ba7d377
Merge branch 'master' into tm_update_1
tac0turtle Aug 3, 2020
9d0f660
tendermint: update 4 (#6919)
tac0turtle Aug 3, 2020
f19c9ce
Merge branch 'master' into tm_update_1
tac0turtle Aug 3, 2020
30bd547
Merge branch 'master' into tm_update_1
tac0turtle Aug 4, 2020
a585659
Merge branch 'master' into tm_update_1
tac0turtle Aug 5, 2020
4762dd0
Merge branch 'master' into tm_update_1
tac0turtle Aug 6, 2020
91173b1
tendermint: update 5 (#6923)
tac0turtle Aug 6, 2020
b37f69d
bump to latest master
tac0turtle Aug 6, 2020
00efa6f
Merge branch 'master' into tm_update_1
tac0turtle Aug 6, 2020
6fae6b0
Merge branch 'master' into tm_update_1
tac0turtle Aug 7, 2020
0193208
Merge branch 'master' into tm_update_1
tac0turtle Aug 11, 2020
b0884e9
Merge branch 'master' into tm_update_1
tac0turtle Aug 11, 2020
280a4af
Merge branch 'master' into tm_update_1
tac0turtle Aug 12, 2020
144234b
Merge branch 'master' into tm_update_1
tac0turtle Aug 12, 2020
48ac48f
Merge branch 'master' into tm_update_1
tac0turtle Aug 13, 2020
82f0abc
tendermint: update (#6972)
tac0turtle Aug 14, 2020
3fb12d0
Merge branch 'master' into tm_update_1
tac0turtle Aug 14, 2020
b5e7705
Update x/ibc/07-tendermint/types/test_utils.go
tac0turtle Aug 14, 2020
22d47e2
address comment
tac0turtle Aug 14, 2020
af478fb
Merge branch 'master' into tm_update_1
tac0turtle Aug 14, 2020
12a7ac5
go mod
tac0turtle Aug 14, 2020
dc4782c
bring back things
tac0turtle Aug 14, 2020
09feb5d
fix test
fedekunze Aug 14, 2020
9cdb890
update tm proto files
fedekunze Aug 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix import
  • Loading branch information
@tac0turtle
tac0turtle committed Jul 30, 2020
commit f98e70a7a9b1d567aa0c78220089a29c245a9495
2 changes: 1 addition & 1 deletion x/staking/keeper/querier_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import (
"fmt"
"testing"

"github.com/cosmos/cosmos-sdk/codec"
"github.com/stretchr/testify/require"
abci "github.com/tendermint/tendermint/abci/types"
tmproto "github.com/tendermint/tendermint/proto/tendermint/types"

"github.com/cosmos/cosmos-sdk/codec"
"github.com/cosmos/cosmos-sdk/simapp"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/x/staking/keeper"
Expand Down