Merge pull request #1950 from CortexFoundation/dev

ucwong · web-flow · commit 9a588dae4adf · 2024-03-24T17:57:23.000Z
Dev
diff --git a/cmd/devp2p/discv5cmd.go b/cmd/devp2p/discv5cmd.go
@@ -21,8 +21,8 @@ import (
 	"os"
 	"time"
 
-	"golang.org/x/exp/slog"
 	"gopkg.in/urfave/cli.v1"
+	"log/slog"
 
 	"github.com/CortexFoundation/CortexTheseus/cmd/devp2p/internal/v5test"
 	"github.com/CortexFoundation/CortexTheseus/common"
diff --git a/core/headerchain_test.go b/core/headerchain_test.go
@@ -29,7 +29,8 @@ import (
 	"github.com/CortexFoundation/CortexTheseus/core/types"
 	"github.com/CortexFoundation/CortexTheseus/log"
 	"github.com/CortexFoundation/CortexTheseus/params"
-	"golang.org/x/exp/slog"
+
+	"log/slog"
 )
 
 func verifyUnbrokenCanonchain(hc *HeaderChain) error {
diff --git a/ctxc/downloader/queue_test.go b/ctxc/downloader/queue_test.go
@@ -32,7 +32,8 @@ import (
 	"github.com/CortexFoundation/CortexTheseus/core/types"
 	"github.com/CortexFoundation/CortexTheseus/log"
 	"github.com/CortexFoundation/CortexTheseus/params"
-	"golang.org/x/exp/slog"
+
+	"log/slog"
 )
 
 var (
diff --git a/vendor/github.com/anacrolix/torrent/logging.go b/vendor/github.com/anacrolix/torrent/logging.go

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,8 @@ import (`
`29`	`29`	`"github.com/CortexFoundation/CortexTheseus/core/types"`
`30`	`30`	`"github.com/CortexFoundation/CortexTheseus/log"`
`31`	`31`	`"github.com/CortexFoundation/CortexTheseus/params"`
`32`		`- "golang.org/x/exp/slog"`
	`32`	`+`
	`33`	`+ "log/slog"`
`33`	`34`	`)`
`34`	`35`
`35`	`36`	`func verifyUnbrokenCanonchain(hc *HeaderChain) error {`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,8 @@ import (`
`32`	`32`	`"github.com/CortexFoundation/CortexTheseus/core/types"`
`33`	`33`	`"github.com/CortexFoundation/CortexTheseus/log"`
`34`	`34`	`"github.com/CortexFoundation/CortexTheseus/params"`
`35`		`- "golang.org/x/exp/slog"`
	`35`	`+`
	`36`	`+ "log/slog"`
`36`	`37`	`)`
`37`	`38`
`38`	`39`	`var (`