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

Jump to bottom

refactor: use cosmos-sdk/log throughout #14909

Merged
merged 16 commits into from
Feb 7, 2023
Merged

refactor: use cosmos-sdk/log throughout #14909

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
d0dc85f
use logger from sdk
tac0turtle Feb 5, 2023
c2f6aa8
remove more instances of tmlog
tac0turtle Feb 3, 2023
e912eb9
fix go.mods
tac0turtle Feb 4, 2023
7f0472e
build
tac0turtle Feb 5, 2023
23ddc91
test build
tac0turtle Feb 5, 2023
9212d2e
tes build
tac0turtle Feb 5, 2023
a4539a4
build
tac0turtle Feb 5, 2023
c85aaff
go get
tac0turtle Feb 5, 2023
8ef2cbc
try
tac0turtle Feb 5, 2023
dd58e12
try
tac0turtle Feb 5, 2023
eafda37
change noplogger from pointer to non
tac0turtle Feb 6, 2023
cc667c7
Merge branch 'main' into marko/uselog
tac0turtle Feb 7, 2023
39b827a
update docker files
tac0turtle Feb 7, 2023
0f52d33
fix typp
tac0turtle Feb 7, 2023
74b509b
fix test
tac0turtle Feb 7, 2023
4e204bf
Merge branch 'main' into marko/uselog
tac0turtle Feb 7, 2023
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
test build
  • Loading branch information
@tac0turtle
tac0turtle committed Feb 5, 2023
commit 23ddc91807188e8fadb8cfe2e848e60d2ec5e3c7
2 changes: 2 additions & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,8 @@ replace github.com/cometbft/cometbft => github.com/cometbft/cometbft v0.0.0-2023
replace (
// use cosmos fork of keyring
github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0

github.com/cosmos/cosmos-sdk/log => ./log
// dgrijalva/jwt-go is deprecated and doesn't receive security updates.
// TODO: remove it: https://github.com/cosmos/cosmos-sdk/issues/13134
github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.4.2
Expand Down
2 changes: 0 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,6 @@ github.com/cosmos/cosmos-proto v1.0.0-beta.1 h1:iDL5qh++NoXxG8hSy93FdYJut4XfgbSh
github.com/cosmos/cosmos-proto v1.0.0-beta.1/go.mod h1:8k2GNZghi5sDRFw/scPL8gMSowT1vDA+5ouxL8GjaUE=
github.com/cosmos/cosmos-sdk/db v1.0.0-beta.1.0.20220726092710-f848e4300a8a h1:2humuGPw3O5riJVFq/E2FRjF57UrO97W1qJcGVmK+6k=
github.com/cosmos/cosmos-sdk/db v1.0.0-beta.1.0.20220726092710-f848e4300a8a/go.mod h1:c8IO23vgNxueCCJlSI9awQtcxsvc+buzaeThB85qfBU=
github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 h1:w/pmi2E+KaWm0n/XMFK42w+bxKVh90MQforxrEsVRhE=
github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1/go.mod h1:KeFt2fAXe+xLWpJ/8KeGI6JtHzpA7jVMQN1dIfi5SgY=
github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y=
github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY=
github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw=
Expand Down
1 change: 1 addition & 0 deletions simapp/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@ replace (
github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0
// Simapp always use the latest version of the cosmos-sdk
github.com/cosmos/cosmos-sdk => ../.
github.com/cosmos/cosmos-sdk/log => ../log
// Fix upstream GHSA-h395-qcrw-5vmq vulnerability.
// TODO Remove it: https://github.com/cosmos/cosmos-sdk/issues/10409
github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.8.1
Expand Down
2 changes: 0 additions & 2 deletions simapp/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,8 +201,6 @@ github.com/cosmos/cosmos-db v1.0.0-rc.1 h1:SjnT8B6WKMW9WEIX32qMhnEEKcI7ZP0+G1Sa9
github.com/cosmos/cosmos-db v1.0.0-rc.1/go.mod h1:Dnmk3flSf5lkwCqvvjNpoxjpXzhxnCAFzKHlbaForso=
github.com/cosmos/cosmos-proto v1.0.0-beta.1 h1:iDL5qh++NoXxG8hSy93FdYJut4XfgbShIocllGaXx/0=
github.com/cosmos/cosmos-proto v1.0.0-beta.1/go.mod h1:8k2GNZghi5sDRFw/scPL8gMSowT1vDA+5ouxL8GjaUE=
github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 h1:w/pmi2E+KaWm0n/XMFK42w+bxKVh90MQforxrEsVRhE=
github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1/go.mod h1:KeFt2fAXe+xLWpJ/8KeGI6JtHzpA7jVMQN1dIfi5SgY=
github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y=
github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY=
github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw=
Expand Down
4 changes: 3 additions & 1 deletion store/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
cosmossdk.io/errors v1.0.0-beta.7
cosmossdk.io/math v1.0.0-beta.5
github.com/armon/go-metrics v0.4.1
github.com/cometbft/cometbft v0.0.0-20230202201700-d159562d0d96
github.com/cometbft/cometbft v0.0.0-20230203130311-387422ac220d
github.com/confio/ics23/go v0.9.0
github.com/cosmos/cosmos-db v0.0.0-20230119180254-161cf3632b7c
github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1
Expand Down Expand Up @@ -72,6 +72,8 @@ require (
// TODO update/remove after v0.37.x tag of CometBFT
replace github.com/cometbft/cometbft => github.com/cometbft/cometbft v0.0.0-20230203130311-387422ac220d

replace github.com/cosmos/cosmos-sdk/log => ../log

// Fix upstream GHSA-h395-qcrw-5vmq vulnerability.
// TODO Remove it: https://github.com/cosmos/cosmos-sdk/issues/10409
replace github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.8.1
7 changes: 0 additions & 7 deletions store/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,6 @@ github.com/cosmos/cosmos-db v0.0.0-20230119180254-161cf3632b7c h1:18vrPZBG4Zuh8A
github.com/cosmos/cosmos-db v0.0.0-20230119180254-161cf3632b7c/go.mod h1:NoM5UQkpKJY86c0Acb8Hy7HyNrltal8+BxQyerU8fzM=
github.com/cosmos/cosmos-proto v1.0.0-beta.1 h1:iDL5qh++NoXxG8hSy93FdYJut4XfgbShIocllGaXx/0=
github.com/cosmos/cosmos-proto v1.0.0-beta.1/go.mod h1:8k2GNZghi5sDRFw/scPL8gMSowT1vDA+5ouxL8GjaUE=
<<<<<<< HEAD
||||||| parent of d92fd24ba6 (fix go.mods)
>>>>>>> main
=======
github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 h1:w/pmi2E+KaWm0n/XMFK42w+bxKVh90MQforxrEsVRhE=
github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1/go.mod h1:KeFt2fAXe+xLWpJ/8KeGI6JtHzpA7jVMQN1dIfi5SgY=
>>>>>>> d92fd24ba6 (fix go.mods)
github.com/cosmos/gogoproto v1.4.4 h1:nVAsgLlAf5jeN0fV7hRlkZvf768zU+dy4pG+hxc2P34=
github.com/cosmos/gogoproto v1.4.4/go.mod h1:/yl6/nLwsZcZ2JY3OrqjRqvqCG9InUMcXRfRjQiF9DU=
github.com/cosmos/iavl v0.20.0-alpha3 h1:hbUyr0dkiGDlmmbrArvte0lXv6VkMrGQNr3b29xvmVk=
Expand Down