chore: update x/slog import to log/slog

Signed-off-by: gfanton <[email protected]>
gnolang · Feb 13, 2024 · d993d3b · d993d3b
1 parent 3735749
commit d993d3b
Show file tree

Hide file tree

Showing 50 changed files with 48 additions and 95 deletions.
diff --git 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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -7,15 +7,14 @@ import (
 	"fmt"
 	"io"
 	"io/fs"
+	"log/slog"
 	"net/http"
 	"os"
 	"path/filepath"
 	"runtime"
 	"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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -6,15 +6,14 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"log/slog"
 	"os"
 	"path/filepath"
 	"runtime"
 	"sort"
 	"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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,10 +1,9 @@
 package privval
 
 import (
+	"log/slog"
 	"time"
 
-	"golang.org/x/exp/slog"
-
 	"github.com/gnolang/gno/tm2/pkg/service"
 )