From d993d3b9ad34ab51de670e8c777de0dc0b893136 Mon Sep 17 00:00:00 2001 From: gfanton <8671905+gfanton@users.noreply.github.com> Date: Tue, 13 Feb 2024 14:27:41 +0100 Subject: [PATCH] chore: update x/slog import to log/slog Signed-off-by: gfanton <8671905+gfanton@users.noreply.github.com> --- contribs/gnodev/go.mod | 2 +- contribs/gnodev/pkg/dev/node.go | 2 +- contribs/gnokeykc/go.mod | 1 - contribs/gnokeykc/go.sum | 2 -- gno.land/pkg/gnoland/app.go | 3 +-- gno.land/pkg/gnoland/node_inmemory.go | 3 +-- gno.land/pkg/gnoweb/gnoweb.go | 3 +-- gno.land/pkg/integration/testing_integration.go | 3 +-- gno.land/pkg/integration/testing_node.go | 3 +-- gno.land/pkg/log/zap.go | 3 +-- go.mod | 2 +- misc/loop/go.mod | 1 - misc/loop/go.sum | 2 -- tm2/pkg/bft/abci/example/kvstore/persistent_kvstore.go | 3 +-- tm2/pkg/bft/blockchain/pool.go | 3 +-- tm2/pkg/bft/blockchain/reactor.go | 3 +-- tm2/pkg/bft/blockchain/reactor_test.go | 3 +-- tm2/pkg/bft/consensus/common_test.go | 3 +-- tm2/pkg/bft/consensus/reactor.go | 3 +-- tm2/pkg/bft/consensus/reactor_test.go | 3 +-- tm2/pkg/bft/consensus/replay.go | 3 +-- tm2/pkg/bft/consensus/replay_test.go | 3 +-- tm2/pkg/bft/consensus/state.go | 3 +-- tm2/pkg/bft/consensus/ticker.go | 3 +-- tm2/pkg/bft/consensus/wal_generator.go | 3 +-- tm2/pkg/bft/mempool/clist_mempool.go | 3 +-- tm2/pkg/bft/mempool/reactor.go | 3 +-- tm2/pkg/bft/node/node.go | 7 +++---- tm2/pkg/bft/privval/signer_dialer_endpoint.go | 3 +-- tm2/pkg/bft/privval/signer_listener_endpoint.go | 3 +-- tm2/pkg/bft/privval/signer_listener_endpoint_test.go | 3 +-- tm2/pkg/bft/privval/utils.go | 3 +-- tm2/pkg/bft/rpc/client/localclient.go | 2 +- tm2/pkg/bft/rpc/core/pipe.go | 3 +-- tm2/pkg/bft/rpc/lib/server/handlers.go | 3 +-- tm2/pkg/bft/rpc/lib/server/http_server.go | 3 +-- tm2/pkg/bft/state/execution.go | 3 +-- tm2/pkg/bft/store/store_test.go | 3 +-- tm2/pkg/bft/wal/wal.go | 3 +-- tm2/pkg/log/noop.go | 3 +-- tm2/pkg/log/testing.go | 2 +- tm2/pkg/p2p/conn/connection.go | 3 +-- tm2/pkg/p2p/peer.go | 3 +-- tm2/pkg/p2p/upnp/probe.go | 3 +-- tm2/pkg/sdk/auth/keeper.go | 3 +-- tm2/pkg/sdk/bank/keeper.go | 3 +-- tm2/pkg/sdk/baseapp.go | 3 +-- tm2/pkg/sdk/baseapp_test.go | 3 +-- tm2/pkg/sdk/context.go | 3 +-- tm2/pkg/service/service.go | 3 +-- 50 files changed, 48 insertions(+), 95 deletions(-) diff --git a/contribs/gnodev/go.mod b/contribs/gnodev/go.mod index 9b1fdedf807..70cc1632a14 100644 --- a/contribs/gnodev/go.mod +++ b/contribs/gnodev/go.mod @@ -8,7 +8,6 @@ require ( github.com/fsnotify/fsnotify v1.7.0 github.com/gnolang/gno v0.0.0-00010101000000-000000000000 go.uber.org/zap v1.24.0 - golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 golang.org/x/term v0.16.0 ) @@ -60,6 +59,7 @@ require ( go.uber.org/multierr v1.10.0 // indirect go.uber.org/zap/exp v0.1.0 // indirect golang.org/x/crypto v0.18.0 // indirect + golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 // indirect golang.org/x/mod v0.14.0 // indirect golang.org/x/net v0.20.0 // indirect golang.org/x/sys v0.16.0 // indirect diff --git a/contribs/gnodev/pkg/dev/node.go b/contribs/gnodev/pkg/dev/node.go index c1eddc7c91d..0b271c14636 100644 --- a/contribs/gnodev/pkg/dev/node.go +++ b/contribs/gnodev/pkg/dev/node.go @@ -3,6 +3,7 @@ package dev import ( "context" "fmt" + "log/slog" "github.com/gnolang/gno/gno.land/pkg/gnoland" "github.com/gnolang/gno/gno.land/pkg/integration" @@ -16,7 +17,6 @@ import ( bft "github.com/gnolang/gno/tm2/pkg/bft/types" "github.com/gnolang/gno/tm2/pkg/crypto" "github.com/gnolang/gno/tm2/pkg/std" - "golang.org/x/exp/slog" // backup "github.com/gnolang/tx-archive/backup/client" // restore "github.com/gnolang/tx-archive/restore/client" ) diff --git a/contribs/gnokeykc/go.mod b/contribs/gnokeykc/go.mod index ac6bc51fdaa..b3b3f9d7c36 100644 --- a/contribs/gnokeykc/go.mod +++ b/contribs/gnokeykc/go.mod @@ -50,7 +50,6 @@ require ( go.etcd.io/bbolt v1.3.8 // indirect go.opencensus.io v0.22.5 // indirect golang.org/x/crypto v0.18.0 // indirect - golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 // indirect golang.org/x/mod v0.14.0 // indirect golang.org/x/net v0.20.0 // indirect golang.org/x/sys v0.16.0 // indirect diff --git a/contribs/gnokeykc/go.sum b/contribs/gnokeykc/go.sum index a5d728b9816..d11f3b9cb7d 100644 --- a/contribs/gnokeykc/go.sum +++ b/contribs/gnokeykc/go.sum @@ -214,8 +214,6 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc= golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 h1:hNQpMuAJe5CtcUqCXaWga3FHu+kQvCqcsoVaQgSV60o= -golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= diff --git a/gno.land/pkg/gnoland/app.go b/gno.land/pkg/gnoland/app.go index 0b0488fc98e..007ec4a7633 100644 --- a/gno.land/pkg/gnoland/app.go +++ b/gno.land/pkg/gnoland/app.go @@ -2,10 +2,9 @@ package gnoland import ( "fmt" + "log/slog" "path/filepath" - "golang.org/x/exp/slog" - "github.com/gnolang/gno/gno.land/pkg/sdk/vm" "github.com/gnolang/gno/gnovm/pkg/gnoenv" "github.com/gnolang/gno/tm2/pkg/amino" diff --git a/gno.land/pkg/gnoland/node_inmemory.go b/gno.land/pkg/gnoland/node_inmemory.go index 2db8544a909..6301883128a 100644 --- a/gno.land/pkg/gnoland/node_inmemory.go +++ b/gno.land/pkg/gnoland/node_inmemory.go @@ -2,11 +2,10 @@ package gnoland import ( "fmt" + "log/slog" "sync" "time" - "golang.org/x/exp/slog" - abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" tmcfg "github.com/gnolang/gno/tm2/pkg/bft/config" "github.com/gnolang/gno/tm2/pkg/bft/node" diff --git a/gno.land/pkg/gnoweb/gnoweb.go b/gno.land/pkg/gnoweb/gnoweb.go index 451389c7d73..4854ed4791e 100644 --- a/gno.land/pkg/gnoweb/gnoweb.go +++ b/gno.land/pkg/gnoweb/gnoweb.go @@ -7,6 +7,7 @@ import ( "fmt" "io" "io/fs" + "log/slog" "net/http" "os" "path/filepath" @@ -14,8 +15,6 @@ import ( "strings" "time" - "golang.org/x/exp/slog" - "github.com/gnolang/gno/tm2/pkg/amino" abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" "github.com/gnolang/gno/tm2/pkg/bft/rpc/client" diff --git a/gno.land/pkg/integration/testing_integration.go b/gno.land/pkg/integration/testing_integration.go index b0dcc5737e6..04382076816 100644 --- a/gno.land/pkg/integration/testing_integration.go +++ b/gno.land/pkg/integration/testing_integration.go @@ -5,14 +5,13 @@ import ( "errors" "fmt" "hash/crc32" + "log/slog" "os" "path/filepath" "strconv" "strings" "testing" - "golang.org/x/exp/slog" - "github.com/gnolang/gno/gno.land/pkg/gnoland" "github.com/gnolang/gno/gno.land/pkg/keyscli" "github.com/gnolang/gno/gno.land/pkg/log" diff --git a/gno.land/pkg/integration/testing_node.go b/gno.land/pkg/integration/testing_node.go index cc0262b8105..b164c267e87 100644 --- a/gno.land/pkg/integration/testing_node.go +++ b/gno.land/pkg/integration/testing_node.go @@ -1,11 +1,10 @@ package integration import ( + "log/slog" "path/filepath" "time" - "golang.org/x/exp/slog" - "github.com/gnolang/gno/gno.land/pkg/gnoland" abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" tmcfg "github.com/gnolang/gno/tm2/pkg/bft/config" diff --git a/gno.land/pkg/log/zap.go b/gno.land/pkg/log/zap.go index a68e034eab6..cd5f6471546 100644 --- a/gno.land/pkg/log/zap.go +++ b/gno.land/pkg/log/zap.go @@ -2,8 +2,7 @@ package log import ( "io" - - "golang.org/x/exp/slog" + "log/slog" "go.uber.org/zap" "go.uber.org/zap/exp/zapslog" diff --git a/go.mod b/go.mod index 7fd4ee6108a..4da73f73a71 100644 --- a/go.mod +++ b/go.mod @@ -35,7 +35,7 @@ require ( go.uber.org/zap v1.24.0 go.uber.org/zap/exp v0.1.0 golang.org/x/crypto v0.18.0 - golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 + golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 // indirect golang.org/x/mod v0.14.0 golang.org/x/net v0.20.0 golang.org/x/term v0.16.0 diff --git a/misc/loop/go.mod b/misc/loop/go.mod index f4c0e7ea598..1f1dedd6074 100644 --- a/misc/loop/go.mod +++ b/misc/loop/go.mod @@ -47,7 +47,6 @@ require ( go.uber.org/zap v1.26.0 // indirect go.uber.org/zap/exp v0.2.0 // indirect golang.org/x/crypto v0.18.0 // indirect - golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 // indirect golang.org/x/mod v0.14.0 // indirect golang.org/x/net v0.20.0 // indirect golang.org/x/sys v0.16.0 // indirect diff --git a/misc/loop/go.sum b/misc/loop/go.sum index 326a1a8c0b4..4bd5ab654a1 100644 --- a/misc/loop/go.sum +++ b/misc/loop/go.sum @@ -221,8 +221,6 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc= golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 h1:hNQpMuAJe5CtcUqCXaWga3FHu+kQvCqcsoVaQgSV60o= -golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= diff --git a/tm2/pkg/bft/abci/example/kvstore/persistent_kvstore.go b/tm2/pkg/bft/abci/example/kvstore/persistent_kvstore.go index 5042fcf9313..0e31f83b3c0 100644 --- a/tm2/pkg/bft/abci/example/kvstore/persistent_kvstore.go +++ b/tm2/pkg/bft/abci/example/kvstore/persistent_kvstore.go @@ -3,11 +3,10 @@ package kvstore import ( "encoding/base64" "fmt" + "log/slog" "strconv" "strings" - "golang.org/x/exp/slog" - "github.com/gnolang/gno/tm2/pkg/amino" "github.com/gnolang/gno/tm2/pkg/bft/abci/example/errors" abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" diff --git a/tm2/pkg/bft/blockchain/pool.go b/tm2/pkg/bft/blockchain/pool.go index a3a24d265a8..5a82eb4d1d6 100644 --- a/tm2/pkg/bft/blockchain/pool.go +++ b/tm2/pkg/bft/blockchain/pool.go @@ -3,13 +3,12 @@ package blockchain import ( "errors" "fmt" + "log/slog" "math" "sync" "sync/atomic" "time" - "golang.org/x/exp/slog" - "github.com/gnolang/gno/tm2/pkg/bft/types" "github.com/gnolang/gno/tm2/pkg/flow" "github.com/gnolang/gno/tm2/pkg/log" diff --git a/tm2/pkg/bft/blockchain/reactor.go b/tm2/pkg/bft/blockchain/reactor.go index bf5f7ea71b3..09e1225b717 100644 --- a/tm2/pkg/bft/blockchain/reactor.go +++ b/tm2/pkg/bft/blockchain/reactor.go @@ -3,11 +3,10 @@ package blockchain import ( "errors" "fmt" + "log/slog" "reflect" "time" - "golang.org/x/exp/slog" - "github.com/gnolang/gno/tm2/pkg/amino" sm "github.com/gnolang/gno/tm2/pkg/bft/state" "github.com/gnolang/gno/tm2/pkg/bft/store" diff --git a/tm2/pkg/bft/blockchain/reactor_test.go b/tm2/pkg/bft/blockchain/reactor_test.go index 982c29033fa..6101956051d 100644 --- a/tm2/pkg/bft/blockchain/reactor_test.go +++ b/tm2/pkg/bft/blockchain/reactor_test.go @@ -1,13 +1,12 @@ package blockchain import ( + "log/slog" "os" "sort" "testing" "time" - "golang.org/x/exp/slog" - "github.com/stretchr/testify/assert" abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" diff --git a/tm2/pkg/bft/consensus/common_test.go b/tm2/pkg/bft/consensus/common_test.go index 4a0a4eebf03..c95c104ce3a 100644 --- a/tm2/pkg/bft/consensus/common_test.go +++ b/tm2/pkg/bft/consensus/common_test.go @@ -3,6 +3,7 @@ package consensus import ( "bytes" "fmt" + "log/slog" "os" "path" "path/filepath" @@ -11,8 +12,6 @@ import ( "testing" "time" - "golang.org/x/exp/slog" - abcicli "github.com/gnolang/gno/tm2/pkg/bft/abci/client" "github.com/gnolang/gno/tm2/pkg/bft/abci/example/counter" "github.com/gnolang/gno/tm2/pkg/bft/abci/example/kvstore" diff --git a/tm2/pkg/bft/consensus/reactor.go b/tm2/pkg/bft/consensus/reactor.go index 27ead3f08f0..ed7a6ae6547 100644 --- a/tm2/pkg/bft/consensus/reactor.go +++ b/tm2/pkg/bft/consensus/reactor.go @@ -2,12 +2,11 @@ package consensus import ( "fmt" + "log/slog" "reflect" "sync" "time" - "golang.org/x/exp/slog" - "github.com/gnolang/gno/tm2/pkg/amino" cstypes "github.com/gnolang/gno/tm2/pkg/bft/consensus/types" sm "github.com/gnolang/gno/tm2/pkg/bft/state" diff --git a/tm2/pkg/bft/consensus/reactor_test.go b/tm2/pkg/bft/consensus/reactor_test.go index 96fd2ed987b..42f944b7481 100644 --- a/tm2/pkg/bft/consensus/reactor_test.go +++ b/tm2/pkg/bft/consensus/reactor_test.go @@ -2,12 +2,11 @@ package consensus import ( "fmt" + "log/slog" "sync" "testing" "time" - "golang.org/x/exp/slog" - "github.com/stretchr/testify/assert" "github.com/gnolang/gno/tm2/pkg/amino" diff --git a/tm2/pkg/bft/consensus/replay.go b/tm2/pkg/bft/consensus/replay.go index 103cf67f512..5fe24229007 100644 --- a/tm2/pkg/bft/consensus/replay.go +++ b/tm2/pkg/bft/consensus/replay.go @@ -5,11 +5,10 @@ import ( "errors" "fmt" "io" + "log/slog" "reflect" "time" - "golang.org/x/exp/slog" - abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" cstypes "github.com/gnolang/gno/tm2/pkg/bft/consensus/types" "github.com/gnolang/gno/tm2/pkg/bft/mempool/mock" diff --git a/tm2/pkg/bft/consensus/replay_test.go b/tm2/pkg/bft/consensus/replay_test.go index 981e72d6ca3..8a600dc68c4 100644 --- a/tm2/pkg/bft/consensus/replay_test.go +++ b/tm2/pkg/bft/consensus/replay_test.go @@ -6,6 +6,7 @@ import ( "errors" "fmt" "io" + "log/slog" "os" "path/filepath" "runtime" @@ -13,8 +14,6 @@ import ( "testing" "time" - "golang.org/x/exp/slog" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tm2/pkg/bft/consensus/state.go b/tm2/pkg/bft/consensus/state.go index c5486bb38a4..e6b4ace8d2f 100644 --- a/tm2/pkg/bft/consensus/state.go +++ b/tm2/pkg/bft/consensus/state.go @@ -4,13 +4,12 @@ import ( "bytes" goerrors "errors" "fmt" + "log/slog" "reflect" "runtime/debug" "sync" "time" - "golang.org/x/exp/slog" - "github.com/gnolang/gno/tm2/pkg/amino" cnscfg "github.com/gnolang/gno/tm2/pkg/bft/consensus/config" cstypes "github.com/gnolang/gno/tm2/pkg/bft/consensus/types" diff --git a/tm2/pkg/bft/consensus/ticker.go b/tm2/pkg/bft/consensus/ticker.go index 4e664304c92..8448e014260 100644 --- a/tm2/pkg/bft/consensus/ticker.go +++ b/tm2/pkg/bft/consensus/ticker.go @@ -1,10 +1,9 @@ package consensus import ( + "log/slog" "time" - "golang.org/x/exp/slog" - "github.com/gnolang/gno/tm2/pkg/service" ) diff --git a/tm2/pkg/bft/consensus/wal_generator.go b/tm2/pkg/bft/consensus/wal_generator.go index 8a737452425..fd322f221fe 100644 --- a/tm2/pkg/bft/consensus/wal_generator.go +++ b/tm2/pkg/bft/consensus/wal_generator.go @@ -5,12 +5,11 @@ import ( "bytes" "fmt" "io" + "log/slog" "path/filepath" "testing" "time" - "golang.org/x/exp/slog" - "github.com/gnolang/gno/tm2/pkg/bft/abci/example/kvstore" cfg "github.com/gnolang/gno/tm2/pkg/bft/config" "github.com/gnolang/gno/tm2/pkg/bft/mempool/mock" diff --git a/tm2/pkg/bft/mempool/clist_mempool.go b/tm2/pkg/bft/mempool/clist_mempool.go index da0a2c22c11..e7a356d1ad3 100644 --- a/tm2/pkg/bft/mempool/clist_mempool.go +++ b/tm2/pkg/bft/mempool/clist_mempool.go @@ -5,12 +5,11 @@ import ( "container/list" "crypto/sha256" "fmt" + "log/slog" "sync" "sync/atomic" "time" - "golang.org/x/exp/slog" - auto "github.com/gnolang/gno/tm2/pkg/autofile" abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" cfg "github.com/gnolang/gno/tm2/pkg/bft/mempool/config" diff --git a/tm2/pkg/bft/mempool/reactor.go b/tm2/pkg/bft/mempool/reactor.go index 7147c11169b..3ef85b80a21 100644 --- a/tm2/pkg/bft/mempool/reactor.go +++ b/tm2/pkg/bft/mempool/reactor.go @@ -2,13 +2,12 @@ package mempool import ( "fmt" + "log/slog" "math" "reflect" "sync" "time" - "golang.org/x/exp/slog" - "github.com/gnolang/gno/tm2/pkg/amino" cfg "github.com/gnolang/gno/tm2/pkg/bft/mempool/config" "github.com/gnolang/gno/tm2/pkg/bft/types" diff --git a/tm2/pkg/bft/node/node.go b/tm2/pkg/bft/node/node.go index 57cc18b8ad7..561bff5fa45 100644 --- a/tm2/pkg/bft/node/node.go +++ b/tm2/pkg/bft/node/node.go @@ -5,15 +5,14 @@ package node import ( "fmt" + "log/slog" "net" - "net/http" - _ "net/http/pprof" //nolint:gosec + "net/http" //nolint:gosec + _ "net/http/pprof" "strings" "sync" "time" - "golang.org/x/exp/slog" - "github.com/gnolang/gno/tm2/pkg/bft/state/eventstore/file" "github.com/rs/cors" diff --git a/tm2/pkg/bft/privval/signer_dialer_endpoint.go b/tm2/pkg/bft/privval/signer_dialer_endpoint.go index 275c406919f..fa4f5891fc1 100644 --- a/tm2/pkg/bft/privval/signer_dialer_endpoint.go +++ b/tm2/pkg/bft/privval/signer_dialer_endpoint.go @@ -1,10 +1,9 @@ package privval import ( + "log/slog" "time" - "golang.org/x/exp/slog" - "github.com/gnolang/gno/tm2/pkg/service" ) diff --git a/tm2/pkg/bft/privval/signer_listener_endpoint.go b/tm2/pkg/bft/privval/signer_listener_endpoint.go index 7ce42534290..df28d7d3722 100644 --- a/tm2/pkg/bft/privval/signer_listener_endpoint.go +++ b/tm2/pkg/bft/privval/signer_listener_endpoint.go @@ -2,12 +2,11 @@ package privval import ( "fmt" + "log/slog" "net" "sync" "time" - "golang.org/x/exp/slog" - "github.com/gnolang/gno/tm2/pkg/service" ) diff --git a/tm2/pkg/bft/privval/signer_listener_endpoint_test.go b/tm2/pkg/bft/privval/signer_listener_endpoint_test.go index bb026cd9acc..fd9ffb8a245 100644 --- a/tm2/pkg/bft/privval/signer_listener_endpoint_test.go +++ b/tm2/pkg/bft/privval/signer_listener_endpoint_test.go @@ -1,12 +1,11 @@ package privval import ( + "log/slog" "net" "testing" "time" - "golang.org/x/exp/slog" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tm2/pkg/bft/privval/utils.go b/tm2/pkg/bft/privval/utils.go index 904474ba4f7..c759d9dde9d 100644 --- a/tm2/pkg/bft/privval/utils.go +++ b/tm2/pkg/bft/privval/utils.go @@ -2,10 +2,9 @@ package privval import ( "fmt" + "log/slog" "net" - "golang.org/x/exp/slog" - "github.com/gnolang/gno/tm2/pkg/crypto/ed25519" "github.com/gnolang/gno/tm2/pkg/errors" osm "github.com/gnolang/gno/tm2/pkg/os" diff --git a/tm2/pkg/bft/rpc/client/localclient.go b/tm2/pkg/bft/rpc/client/localclient.go index 15e2b916c71..cdd2cd31bb1 100644 --- a/tm2/pkg/bft/rpc/client/localclient.go +++ b/tm2/pkg/bft/rpc/client/localclient.go @@ -1,7 +1,7 @@ package client import ( - "golang.org/x/exp/slog" + "log/slog" nm "github.com/gnolang/gno/tm2/pkg/bft/node" "github.com/gnolang/gno/tm2/pkg/bft/rpc/core" diff --git a/tm2/pkg/bft/rpc/core/pipe.go b/tm2/pkg/bft/rpc/core/pipe.go index 977dfd54e1f..01d558f0b2b 100644 --- a/tm2/pkg/bft/rpc/core/pipe.go +++ b/tm2/pkg/bft/rpc/core/pipe.go @@ -2,8 +2,7 @@ package core import ( "fmt" - - "golang.org/x/exp/slog" + "log/slog" "github.com/gnolang/gno/tm2/pkg/bft/consensus" cnscfg "github.com/gnolang/gno/tm2/pkg/bft/consensus/config" diff --git a/tm2/pkg/bft/rpc/lib/server/handlers.go b/tm2/pkg/bft/rpc/lib/server/handlers.go index 4cfade23711..9e027a7dd0f 100644 --- a/tm2/pkg/bft/rpc/lib/server/handlers.go +++ b/tm2/pkg/bft/rpc/lib/server/handlers.go @@ -7,6 +7,7 @@ import ( "encoding/json" "fmt" "io" + "log/slog" "net/http" "reflect" "regexp" @@ -15,8 +16,6 @@ import ( "strings" "time" - "golang.org/x/exp/slog" - "github.com/gorilla/websocket" "github.com/gnolang/gno/tm2/pkg/amino" diff --git a/tm2/pkg/bft/rpc/lib/server/http_server.go b/tm2/pkg/bft/rpc/lib/server/http_server.go index 102a8203ac5..23ac851512f 100644 --- a/tm2/pkg/bft/rpc/lib/server/http_server.go +++ b/tm2/pkg/bft/rpc/lib/server/http_server.go @@ -5,14 +5,13 @@ import ( "bufio" "encoding/json" "fmt" + "log/slog" "net" "net/http" "runtime/debug" "strings" "time" - "golang.org/x/exp/slog" - "golang.org/x/net/netutil" types "github.com/gnolang/gno/tm2/pkg/bft/rpc/lib/types" diff --git a/tm2/pkg/bft/state/execution.go b/tm2/pkg/bft/state/execution.go index d831fc3678e..00660646b6e 100644 --- a/tm2/pkg/bft/state/execution.go +++ b/tm2/pkg/bft/state/execution.go @@ -2,8 +2,7 @@ package state import ( "fmt" - - "golang.org/x/exp/slog" + "log/slog" "github.com/gnolang/gno/tm2/pkg/amino" abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" diff --git a/tm2/pkg/bft/store/store_test.go b/tm2/pkg/bft/store/store_test.go index 6b5dd8a96bb..547069bc8a8 100644 --- a/tm2/pkg/bft/store/store_test.go +++ b/tm2/pkg/bft/store/store_test.go @@ -2,14 +2,13 @@ package store import ( "fmt" + "log/slog" "os" "runtime/debug" "strings" "testing" "time" - "golang.org/x/exp/slog" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tm2/pkg/bft/wal/wal.go b/tm2/pkg/bft/wal/wal.go index 26f3deeb49c..2424f45dfd2 100644 --- a/tm2/pkg/bft/wal/wal.go +++ b/tm2/pkg/bft/wal/wal.go @@ -8,11 +8,10 @@ import ( "fmt" "hash/crc32" "io" + "log/slog" "path/filepath" "time" - "golang.org/x/exp/slog" - "github.com/gnolang/gno/tm2/pkg/amino" auto "github.com/gnolang/gno/tm2/pkg/autofile" tmtime "github.com/gnolang/gno/tm2/pkg/bft/types/time" diff --git a/tm2/pkg/log/noop.go b/tm2/pkg/log/noop.go index b7c465ede0f..40656d941e1 100644 --- a/tm2/pkg/log/noop.go +++ b/tm2/pkg/log/noop.go @@ -2,8 +2,7 @@ package log import ( "context" - - "golang.org/x/exp/slog" + "log/slog" ) // NewNoopLogger returns a new no-op logger diff --git a/tm2/pkg/log/testing.go b/tm2/pkg/log/testing.go index be610ee38d2..220e3239c30 100644 --- a/tm2/pkg/log/testing.go +++ b/tm2/pkg/log/testing.go @@ -2,6 +2,7 @@ package log import ( "fmt" + "log/slog" "os" "path/filepath" "strings" @@ -9,7 +10,6 @@ import ( "time" "github.com/jaekwon/testify/require" - "golang.org/x/exp/slog" ) // NewTestingLogger returns a new testing logger diff --git a/tm2/pkg/p2p/conn/connection.go b/tm2/pkg/p2p/conn/connection.go index 7f0cf39fe5f..41b6a06629e 100644 --- a/tm2/pkg/p2p/conn/connection.go +++ b/tm2/pkg/p2p/conn/connection.go @@ -5,6 +5,7 @@ import ( goerrors "errors" "fmt" "io" + "log/slog" "math" "net" "reflect" @@ -13,8 +14,6 @@ import ( "sync/atomic" "time" - "golang.org/x/exp/slog" - "github.com/gnolang/gno/tm2/pkg/amino" "github.com/gnolang/gno/tm2/pkg/errors" "github.com/gnolang/gno/tm2/pkg/flow" diff --git a/tm2/pkg/p2p/peer.go b/tm2/pkg/p2p/peer.go index 11814b585c1..ef2ddcf2c25 100644 --- a/tm2/pkg/p2p/peer.go +++ b/tm2/pkg/p2p/peer.go @@ -2,10 +2,9 @@ package p2p import ( "fmt" + "log/slog" "net" - "golang.org/x/exp/slog" - "github.com/gnolang/gno/tm2/pkg/cmap" connm "github.com/gnolang/gno/tm2/pkg/p2p/conn" "github.com/gnolang/gno/tm2/pkg/service" diff --git a/tm2/pkg/p2p/upnp/probe.go b/tm2/pkg/p2p/upnp/probe.go index 29498124aa7..29480e7cecc 100644 --- a/tm2/pkg/p2p/upnp/probe.go +++ b/tm2/pkg/p2p/upnp/probe.go @@ -2,10 +2,9 @@ package upnp import ( "fmt" + "log/slog" "net" "time" - - "golang.org/x/exp/slog" ) type UPNPCapabilities struct { diff --git a/tm2/pkg/sdk/auth/keeper.go b/tm2/pkg/sdk/auth/keeper.go index 405256c6877..e43b5389844 100644 --- a/tm2/pkg/sdk/auth/keeper.go +++ b/tm2/pkg/sdk/auth/keeper.go @@ -2,8 +2,7 @@ package auth import ( "fmt" - - "golang.org/x/exp/slog" + "log/slog" "github.com/gnolang/gno/tm2/pkg/amino" "github.com/gnolang/gno/tm2/pkg/crypto" diff --git a/tm2/pkg/sdk/bank/keeper.go b/tm2/pkg/sdk/bank/keeper.go index 87791258108..5d3699c99ef 100644 --- a/tm2/pkg/sdk/bank/keeper.go +++ b/tm2/pkg/sdk/bank/keeper.go @@ -2,8 +2,7 @@ package bank import ( "fmt" - - "golang.org/x/exp/slog" + "log/slog" "github.com/gnolang/gno/tm2/pkg/crypto" "github.com/gnolang/gno/tm2/pkg/sdk" diff --git a/tm2/pkg/sdk/baseapp.go b/tm2/pkg/sdk/baseapp.go index e564435456a..1f62f53f81a 100644 --- a/tm2/pkg/sdk/baseapp.go +++ b/tm2/pkg/sdk/baseapp.go @@ -2,14 +2,13 @@ package sdk import ( "fmt" + "log/slog" "os" "runtime/debug" "sort" "strings" "syscall" - "golang.org/x/exp/slog" - "github.com/gnolang/gno/tm2/pkg/amino" abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" bft "github.com/gnolang/gno/tm2/pkg/bft/types" diff --git a/tm2/pkg/sdk/baseapp_test.go b/tm2/pkg/sdk/baseapp_test.go index 1d8e73acc8d..403b2521b8f 100644 --- a/tm2/pkg/sdk/baseapp_test.go +++ b/tm2/pkg/sdk/baseapp_test.go @@ -4,12 +4,11 @@ import ( "bytes" "encoding/binary" "fmt" + "log/slog" "os" "reflect" "testing" - "golang.org/x/exp/slog" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tm2/pkg/sdk/context.go b/tm2/pkg/sdk/context.go index c208a3e2e75..0e1021e0174 100644 --- a/tm2/pkg/sdk/context.go +++ b/tm2/pkg/sdk/context.go @@ -2,10 +2,9 @@ package sdk import ( "context" + "log/slog" "time" - "golang.org/x/exp/slog" - "github.com/gnolang/gno/tm2/pkg/amino" abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types" "github.com/gnolang/gno/tm2/pkg/store" diff --git a/tm2/pkg/service/service.go b/tm2/pkg/service/service.go index 2a9fa0c3bfc..05f7a4f4ae6 100644 --- a/tm2/pkg/service/service.go +++ b/tm2/pkg/service/service.go @@ -3,10 +3,9 @@ package service import ( "errors" "fmt" + "log/slog" "sync/atomic" - "golang.org/x/exp/slog" - "github.com/gnolang/gno/tm2/pkg/log" )