chore: use fmt.Errorf replace to xerrors.Errorf

filecoin-project · Sep 29, 2022 · bfbc6d4 · bfbc6d4
1 parent 01b8dc4
commit bfbc6d4
Show file tree

Hide file tree

Showing 87 changed files with 353 additions and 310 deletions.
diff --git a/venus-devtool/compatible/actors/main.go b/venus-devtool/compatible/actors/main.go
@@ -208,6 +208,7 @@ var replicaCmd = &cli.Command{
 			{"\"github.com/filecoin-project/lotus/node/modules/dtypes\"", ""},
 			{"\"github.com/filecoin-project/lotus/chain/types\"", "types \"github.com/filecoin-project/venus/venus-shared/internal\""},
 			{"\"github.com/filecoin-project/lotus/blockstore\"", "blockstore \"github.com/filecoin-project/venus/pkg/util/blockstoreutil\""},
+			{"golang.org/x/xerrors", "fmt"},
 		}
 
 		for _, file := range files {

diff --git a/venus-devtool/compatible/actors/templates.go b/venus-devtool/compatible/actors/templates.go
@@ -43,6 +43,8 @@ var replacers = [][2]string{
 		"dtypes.NetworkName",
 		"string",
 	},
+	{"\"golang.org/x/xerrors\"", "\"fmt\""},
+	{"xerrors.Errorf", "fmt.Errorf"},
 }
 
 func findActorsPkgDir() (string, error) {

diff --git a/venus-shared/actors/builtin/account/actor.go b/venus-shared/actors/builtin/account/actor.go
@@ -3,9 +3,10 @@
 package account
 
 import (
+	"fmt"
+
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	"github.com/filecoin-project/venus/venus-shared/actors"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/cbor"
@@ -35,7 +36,7 @@ var Methods = builtin9.MethodsAccount
 func Load(store adt.Store, act *types.Actor) (State, error) {
 	if name, av, ok := actors.GetActorMetaByCode(act.Code); ok {
 		if name != actors.AccountKey {
-			return nil, xerrors.Errorf("actor code is not account: %s", name)
+			return nil, fmt.Errorf("actor code is not account: %s", name)
 		}
 
 		switch av {
@@ -74,7 +75,7 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 
 	}
 
-	return nil, xerrors.Errorf("unknown actor code %s", act.Code)
+	return nil, fmt.Errorf("unknown actor code %s", act.Code)
 }
 
 func MakeState(store adt.Store, av actorstypes.Version, addr address.Address) (State, error) {
@@ -108,7 +109,7 @@ func MakeState(store adt.Store, av actorstypes.Version, addr address.Address) (S
 		return make9(store, addr)
 
 	}
-	return nil, xerrors.Errorf("unknown actor version %d", av)
+	return nil, fmt.Errorf("unknown actor version %d", av)
 }
 
 type State interface {

diff --git a/venus-shared/actors/builtin/account/actor.go.template b/venus-shared/actors/builtin/account/actor.go.template
@@ -5,7 +5,7 @@ package account
 import (
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	"github.com/filecoin-project/venus/venus-shared/actors"
-	"golang.org/x/xerrors"
+	"fmt"
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/cbor"
@@ -26,7 +26,7 @@ var Methods = builtin{{.latestVersion}}.MethodsAccount
 func Load(store adt.Store, act *types.Actor) (State, error) {
 	if name, av, ok := actors.GetActorMetaByCode(act.Code); ok {
        if name != actors.AccountKey {
-          return nil, xerrors.Errorf("actor code is not account: %s", name)
+          return nil, fmt.Errorf("actor code is not account: %s", name)
        }
 
        switch av {
@@ -48,7 +48,7 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 {{end}}
 	}
 
-	return nil, xerrors.Errorf("unknown actor code %s", act.Code)
+	return nil, fmt.Errorf("unknown actor code %s", act.Code)
 }
 
 func MakeState(store adt.Store, av actorstypes.Version, addr address.Address) (State, error) {
@@ -58,7 +58,7 @@ func MakeState(store adt.Store, av actorstypes.Version, addr address.Address) (S
 		return make{{.}}(store, addr)
 {{end}}
 }
-	return nil, xerrors.Errorf("unknown actor version %d", av)
+	return nil, fmt.Errorf("unknown actor version %d", av)
 }
 
 type State interface {

diff --git a/venus-shared/actors/builtin/cron/actor.go b/venus-shared/actors/builtin/cron/actor.go
@@ -3,11 +3,12 @@
 package cron
 
 import (
+	"fmt"
+
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	"github.com/filecoin-project/venus/venus-shared/actors"
 	"github.com/filecoin-project/venus/venus-shared/actors/adt"
 	types "github.com/filecoin-project/venus/venus-shared/internal"
-	"golang.org/x/xerrors"
 
 	builtin0 "github.com/filecoin-project/specs-actors/actors/builtin"
 
@@ -29,7 +30,7 @@ import (
 func Load(store adt.Store, act *types.Actor) (State, error) {
 	if name, av, ok := actors.GetActorMetaByCode(act.Code); ok {
 		if name != actors.CronKey {
-			return nil, xerrors.Errorf("actor code is not cron: %s", name)
+			return nil, fmt.Errorf("actor code is not cron: %s", name)
 		}
 
 		switch av {
@@ -68,7 +69,7 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 
 	}
 
-	return nil, xerrors.Errorf("unknown actor code %s", act.Code)
+	return nil, fmt.Errorf("unknown actor code %s", act.Code)
 }
 
 func MakeState(store adt.Store, av actorstypes.Version) (State, error) {
@@ -102,7 +103,7 @@ func MakeState(store adt.Store, av actorstypes.Version) (State, error) {
 		return make9(store)
 
 	}
-	return nil, xerrors.Errorf("unknown actor version %d", av)
+	return nil, fmt.Errorf("unknown actor version %d", av)
 }
 
 var (

diff --git a/venus-shared/actors/builtin/cron/actor.go.template b/venus-shared/actors/builtin/cron/actor.go.template
@@ -6,7 +6,7 @@ import (
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	"github.com/filecoin-project/venus/venus-shared/actors"
 	"github.com/filecoin-project/venus/venus-shared/actors/adt"
-	"golang.org/x/xerrors"
+	"fmt"
 	types "github.com/filecoin-project/venus/venus-shared/internal"
 
 {{range .versions}}
@@ -20,7 +20,7 @@ import (
 func Load(store adt.Store, act *types.Actor) (State, error) {
 	if name, av, ok := actors.GetActorMetaByCode(act.Code); ok {
        if name != actors.CronKey {
-          return nil, xerrors.Errorf("actor code is not cron: %s", name)
+          return nil, fmt.Errorf("actor code is not cron: %s", name)
        }
 
        switch av {
@@ -42,7 +42,7 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 {{end}}
 	}
 
-	return nil, xerrors.Errorf("unknown actor code %s", act.Code)
+	return nil, fmt.Errorf("unknown actor code %s", act.Code)
 }
 
 func MakeState(store adt.Store, av actorstypes.Version) (State, error) {
@@ -52,7 +52,7 @@ func MakeState(store adt.Store, av actorstypes.Version) (State, error) {
 		return make{{.}}(store)
 {{end}}
 }
-	return nil, xerrors.Errorf("unknown actor version %d", av)
+	return nil, fmt.Errorf("unknown actor version %d", av)
 }
 
 var (

diff --git a/venus-shared/actors/builtin/init/actor.go b/venus-shared/actors/builtin/init/actor.go
@@ -3,9 +3,10 @@
 package init
 
 import (
+	"fmt"
+
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	"github.com/filecoin-project/venus/venus-shared/actors"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
@@ -40,7 +41,7 @@ var (
 func Load(store adt.Store, act *types.Actor) (State, error) {
 	if name, av, ok := actors.GetActorMetaByCode(act.Code); ok {
 		if name != actors.InitKey {
-			return nil, xerrors.Errorf("actor code is not init: %s", name)
+			return nil, fmt.Errorf("actor code is not init: %s", name)
 		}
 
 		switch av {
@@ -79,7 +80,7 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 
 	}
 
-	return nil, xerrors.Errorf("unknown actor code %s", act.Code)
+	return nil, fmt.Errorf("unknown actor code %s", act.Code)
 }
 
 func MakeState(store adt.Store, av actorstypes.Version, networkName string) (State, error) {
@@ -113,7 +114,7 @@ func MakeState(store adt.Store, av actorstypes.Version, networkName string) (Sta
 		return make9(store, networkName)
 
 	}
-	return nil, xerrors.Errorf("unknown actor version %d", av)
+	return nil, fmt.Errorf("unknown actor version %d", av)
 }
 
 type State interface {

diff --git a/venus-shared/actors/builtin/init/actor.go.template b/venus-shared/actors/builtin/init/actor.go.template
@@ -5,7 +5,7 @@ package init
 import (
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	"github.com/filecoin-project/venus/venus-shared/actors"
-	"golang.org/x/xerrors"
+	"fmt"
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
@@ -31,7 +31,7 @@ var (
 func Load(store adt.Store, act *types.Actor) (State, error) {
 	if name, av, ok := actors.GetActorMetaByCode(act.Code); ok {
        if name != actors.InitKey {
-          return nil, xerrors.Errorf("actor code is not init: %s", name)
+          return nil, fmt.Errorf("actor code is not init: %s", name)
        }
 
        switch av {
@@ -53,7 +53,7 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 {{end}}
 	}
 
-	return nil, xerrors.Errorf("unknown actor code %s", act.Code)
+	return nil, fmt.Errorf("unknown actor code %s", act.Code)
 }
 
 func MakeState(store adt.Store, av actorstypes.Version, networkName string) (State, error) {
@@ -63,7 +63,7 @@ func MakeState(store adt.Store, av actorstypes.Version, networkName string) (Sta
 		return make{{.}}(store, networkName)
 {{end}}
 }
-	return nil, xerrors.Errorf("unknown actor version %d", av)
+	return nil, fmt.Errorf("unknown actor version %d", av)
 }
 
 type State interface {

diff --git a/venus-shared/actors/builtin/init/state.sep.go.template b/venus-shared/actors/builtin/init/state.sep.go.template
@@ -7,7 +7,7 @@ import (
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
-	"golang.org/x/xerrors"
+	"fmt"
 
 	"github.com/filecoin-project/venus/venus-shared/actors/adt"
 
@@ -105,12 +105,12 @@ func (s *state{{.v}}) Remove(addrs ...address.Address) (err error) {
 	}
 	for _, addr := range addrs {
 		if err = m.Delete(abi.AddrKey(addr)); err != nil {
-			return xerrors.Errorf("failed to delete entry for address: %s; err: %w", addr, err)
+			return fmt.Errorf("failed to delete entry for address: %s; err: %w", addr, err)
 		}
 	}
 	amr, err := m.Root()
 	if err != nil {
-		return xerrors.Errorf("failed to get address map root: %w", err)
+		return fmt.Errorf("failed to get address map root: %w", err)
 	}
 	s.State.AddressMap = amr
 	return nil

diff --git a/venus-shared/actors/builtin/init/state.v0.go b/venus-shared/actors/builtin/init/state.v0.go
@@ -3,11 +3,12 @@
 package init
 
 import (
+	"fmt"
+
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/venus/venus-shared/actors/adt"
 
@@ -88,12 +89,12 @@ func (s *state0) Remove(addrs ...address.Address) (err error) {
 	}
 	for _, addr := range addrs {
 		if err = m.Delete(abi.AddrKey(addr)); err != nil {
-			return xerrors.Errorf("failed to delete entry for address: %s; err: %w", addr, err)
+			return fmt.Errorf("failed to delete entry for address: %s; err: %w", addr, err)
 		}
 	}
 	amr, err := m.Root()
 	if err != nil {
-		return xerrors.Errorf("failed to get address map root: %w", err)
+		return fmt.Errorf("failed to get address map root: %w", err)
 	}
 	s.State.AddressMap = amr
 	return nil

diff --git a/venus-shared/actors/builtin/init/state.v2.go b/venus-shared/actors/builtin/init/state.v2.go
@@ -3,11 +3,12 @@
 package init
 
 import (
+	"fmt"
+
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/venus/venus-shared/actors/adt"
 
@@ -88,12 +89,12 @@ func (s *state2) Remove(addrs ...address.Address) (err error) {
 	}
 	for _, addr := range addrs {
 		if err = m.Delete(abi.AddrKey(addr)); err != nil {
-			return xerrors.Errorf("failed to delete entry for address: %s; err: %w", addr, err)
+			return fmt.Errorf("failed to delete entry for address: %s; err: %w", addr, err)
 		}
 	}
 	amr, err := m.Root()
 	if err != nil {
-		return xerrors.Errorf("failed to get address map root: %w", err)
+		return fmt.Errorf("failed to get address map root: %w", err)
 	}
 	s.State.AddressMap = amr
 	return nil

diff --git a/venus-shared/actors/builtin/init/state.v3.go b/venus-shared/actors/builtin/init/state.v3.go
@@ -3,11 +3,12 @@
 package init
 
 import (
+	"fmt"
+
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/venus/venus-shared/actors/adt"
 
@@ -90,12 +91,12 @@ func (s *state3) Remove(addrs ...address.Address) (err error) {
 	}
 	for _, addr := range addrs {
 		if err = m.Delete(abi.AddrKey(addr)); err != nil {
-			return xerrors.Errorf("failed to delete entry for address: %s; err: %w", addr, err)
+			return fmt.Errorf("failed to delete entry for address: %s; err: %w", addr, err)
 		}
 	}
 	amr, err := m.Root()
 	if err != nil {
-		return xerrors.Errorf("failed to get address map root: %w", err)
+		return fmt.Errorf("failed to get address map root: %w", err)
 	}
 	s.State.AddressMap = amr
 	return nil

diff --git a/venus-shared/actors/builtin/init/state.v4.go b/venus-shared/actors/builtin/init/state.v4.go
@@ -3,11 +3,12 @@
 package init
 
 import (
+	"fmt"
+
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/venus/venus-shared/actors/adt"
 
@@ -90,12 +91,12 @@ func (s *state4) Remove(addrs ...address.Address) (err error) {
 	}
 	for _, addr := range addrs {
 		if err = m.Delete(abi.AddrKey(addr)); err != nil {
-			return xerrors.Errorf("failed to delete entry for address: %s; err: %w", addr, err)
+			return fmt.Errorf("failed to delete entry for address: %s; err: %w", addr, err)
 		}
 	}
 	amr, err := m.Root()
 	if err != nil {
-		return xerrors.Errorf("failed to get address map root: %w", err)
+		return fmt.Errorf("failed to get address map root: %w", err)
 	}
 	s.State.AddressMap = amr
 	return nil