From bfbc6d46be1a521626d22667e4f78337711105bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=80=E9=A1=B5=E7=B4=A0=E4=B9=A6?= <2931107265@qq.com> Date: Thu, 29 Sep 2022 09:20:03 +0800 Subject: [PATCH] chore: use fmt.Errorf replace to xerrors.Errorf --- venus-devtool/compatible/actors/main.go | 1 + venus-devtool/compatible/actors/templates.go | 2 ++ venus-shared/actors/builtin/account/actor.go | 9 +++++---- .../actors/builtin/account/actor.go.template | 8 ++++---- venus-shared/actors/builtin/cron/actor.go | 9 +++++---- .../actors/builtin/cron/actor.go.template | 8 ++++---- venus-shared/actors/builtin/init/actor.go | 9 +++++---- .../actors/builtin/init/actor.go.template | 8 ++++---- .../actors/builtin/init/state.sep.go.template | 6 +++--- venus-shared/actors/builtin/init/state.v0.go | 7 ++++--- venus-shared/actors/builtin/init/state.v2.go | 7 ++++--- venus-shared/actors/builtin/init/state.v3.go | 7 ++++--- venus-shared/actors/builtin/init/state.v4.go | 7 ++++--- venus-shared/actors/builtin/init/state.v5.go | 7 ++++--- venus-shared/actors/builtin/init/state.v6.go | 7 ++++--- venus-shared/actors/builtin/init/state.v7.go | 7 ++++--- venus-shared/actors/builtin/init/state.v8.go | 7 ++++--- venus-shared/actors/builtin/init/state.v9.go | 7 ++++--- venus-shared/actors/builtin/market/actor.go | 11 +++++----- .../actors/builtin/market/actor.go.template | 10 +++++----- .../builtin/market/state.sep.go.template | 14 ++++++------- .../actors/builtin/market/state.v0.go | 11 +++++----- .../actors/builtin/market/state.v2.go | 11 +++++----- .../actors/builtin/market/state.v3.go | 11 +++++----- .../actors/builtin/market/state.v4.go | 11 +++++----- .../actors/builtin/market/state.v5.go | 11 +++++----- .../actors/builtin/market/state.v6.go | 11 +++++----- .../actors/builtin/market/state.v7.go | 11 +++++----- .../actors/builtin/market/state.v8.go | 15 +++++++------- .../actors/builtin/market/state.v9.go | 15 +++++++------- venus-shared/actors/builtin/miner/actor.go | 15 +++++++------- .../actors/builtin/miner/actor.go.template | 14 ++++++------- .../builtin/miner/state.sep.go.template | 6 +++--- venus-shared/actors/builtin/miner/state.v0.go | 7 ++++--- venus-shared/actors/builtin/miner/state.v2.go | 7 ++++--- venus-shared/actors/builtin/miner/state.v3.go | 7 ++++--- venus-shared/actors/builtin/miner/state.v4.go | 7 ++++--- venus-shared/actors/builtin/miner/state.v5.go | 7 ++++--- venus-shared/actors/builtin/miner/state.v6.go | 7 ++++--- venus-shared/actors/builtin/miner/state.v7.go | 7 ++++--- venus-shared/actors/builtin/miner/state.v8.go | 7 ++++--- venus-shared/actors/builtin/miner/state.v9.go | 7 ++++--- venus-shared/actors/builtin/multisig/actor.go | 13 ++++++------ .../actors/builtin/multisig/actor.go.template | 13 ++++++------ .../builtin/multisig/message.sep.go.template | 20 +++++++++---------- .../actors/builtin/multisig/message.v0.go | 18 ++++++++--------- .../actors/builtin/multisig/message.v2.go | 6 +++--- .../actors/builtin/multisig/message.v3.go | 6 +++--- .../actors/builtin/multisig/message.v4.go | 6 +++--- .../actors/builtin/multisig/message.v5.go | 6 +++--- .../actors/builtin/multisig/message.v6.go | 6 +++--- .../actors/builtin/multisig/message.v7.go | 6 +++--- .../actors/builtin/multisig/message.v8.go | 8 ++++---- .../actors/builtin/multisig/message.v9.go | 8 ++++---- .../builtin/multisig/state.sep.go.template | 4 ++-- .../actors/builtin/multisig/state.v0.go | 5 +++-- .../actors/builtin/multisig/state.v2.go | 5 +++-- .../actors/builtin/multisig/state.v3.go | 5 +++-- .../actors/builtin/multisig/state.v4.go | 5 +++-- .../actors/builtin/multisig/state.v5.go | 5 +++-- .../actors/builtin/multisig/state.v6.go | 5 +++-- .../actors/builtin/multisig/state.v7.go | 5 +++-- .../actors/builtin/multisig/state.v8.go | 5 +++-- .../actors/builtin/multisig/state.v9.go | 5 +++-- venus-shared/actors/builtin/paych/actor.go | 6 ++---- .../actors/builtin/paych/actor.go.template | 5 ++--- .../builtin/paych/message.sep.go.template | 4 ++-- .../actors/builtin/paych/message.v8.go | 4 ++-- .../actors/builtin/paych/message.v9.go | 4 ++-- venus-shared/actors/builtin/power/actor.go | 9 +++++---- .../actors/builtin/power/actor.go.template | 8 ++++---- venus-shared/actors/builtin/reward/actor.go | 9 +++++---- .../actors/builtin/reward/actor.go.template | 8 ++++---- venus-shared/actors/builtin/system/actor.go | 8 ++++---- .../actors/builtin/system/actor.go.template | 8 ++++---- .../builtin/system/state.sep.go.template | 2 +- .../actors/builtin/system/state.v0.go | 2 +- .../actors/builtin/system/state.v2.go | 2 +- .../actors/builtin/system/state.v3.go | 2 +- .../actors/builtin/system/state.v4.go | 2 +- .../actors/builtin/system/state.v5.go | 2 +- .../actors/builtin/system/state.v6.go | 2 +- .../actors/builtin/system/state.v7.go | 2 +- venus-shared/actors/builtin/verifreg/actor.go | 9 +++++---- .../actors/builtin/verifreg/actor.go.template | 8 ++++---- venus-shared/actors/policy/policy.go | 15 +++++++------- venus-shared/actors/policy/policy.go.template | 14 ++++++------- 87 files changed, 353 insertions(+), 310 deletions(-) diff --git a/venus-devtool/compatible/actors/main.go b/venus-devtool/compatible/actors/main.go index 186889ecf2..2eaebce539 100644 --- 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 index b4276904db..104a415be5 100644 --- 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 index e723bf1487..b6ec5b9619 100644 --- 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 index a5be26200e..04cbe1e4ce 100644 --- 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 index ea8b26f49d..a12ac348f0 100644 --- 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 index 83b01d5886..5a9fcdead6 100644 --- 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 index be089ad8f2..7bf73d25e9 100644 --- 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 index 9b8ebf523c..0bbfe0c24d 100644 --- 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 index 5059bd1955..17aa65b9cd 100644 --- 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 index 185b572199..52fb6f7fa5 100644 --- 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 index d2052f395c..61ef5d2f0e 100644 --- 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 index 709875249e..4ea03f994a 100644 --- 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 index fdb333cfdd..95b393e952 100644 --- 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 diff --git a/venus-shared/actors/builtin/init/state.v5.go b/venus-shared/actors/builtin/init/state.v5.go index 0251b64c2f..cf85332c27 100644 --- a/venus-shared/actors/builtin/init/state.v5.go +++ b/venus-shared/actors/builtin/init/state.v5.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 *state5) 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.v6.go b/venus-shared/actors/builtin/init/state.v6.go index 293ef84e39..a1b895011e 100644 --- a/venus-shared/actors/builtin/init/state.v6.go +++ b/venus-shared/actors/builtin/init/state.v6.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 *state6) 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.v7.go b/venus-shared/actors/builtin/init/state.v7.go index d5d465bffd..b670323197 100644 --- a/venus-shared/actors/builtin/init/state.v7.go +++ b/venus-shared/actors/builtin/init/state.v7.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 *state7) 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.v8.go b/venus-shared/actors/builtin/init/state.v8.go index 65750fba10..3944f0eee5 100644 --- a/venus-shared/actors/builtin/init/state.v8.go +++ b/venus-shared/actors/builtin/init/state.v8.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" @@ -89,12 +90,12 @@ func (s *state8) 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.v9.go b/venus-shared/actors/builtin/init/state.v9.go index e54759484f..7de9d41845 100644 --- a/venus-shared/actors/builtin/init/state.v9.go +++ b/venus-shared/actors/builtin/init/state.v9.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" @@ -89,12 +90,12 @@ func (s *state9) 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/market/actor.go b/venus-shared/actors/builtin/market/actor.go index 7ee02bf919..2dcf1e1d85 100644 --- a/venus-shared/actors/builtin/market/actor.go +++ b/venus-shared/actors/builtin/market/actor.go @@ -7,8 +7,9 @@ import ( actorstypes "github.com/filecoin-project/go-state-types/actors" + "fmt" + "github.com/filecoin-project/go-state-types/network" - "golang.org/x/xerrors" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" @@ -47,7 +48,7 @@ var ( func Load(store adt.Store, act *types.Actor) (State, error) { if name, av, ok := actors.GetActorMetaByCode(act.Code); ok { if name != actors.MarketKey { - return nil, xerrors.Errorf("actor code is not market: %s", name) + return nil, fmt.Errorf("actor code is not market: %s", name) } switch av { @@ -86,7 +87,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) { @@ -120,7 +121,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) } type State interface { @@ -203,7 +204,7 @@ func DecodePublishStorageDealsReturn(b []byte, nv network.Version) (PublishStora return decodePublishStorageDealsReturn9(b) } - return nil, xerrors.Errorf("unknown actor version %d", av) + return nil, fmt.Errorf("unknown actor version %d", av) } type DealProposal = markettypes.DealProposal diff --git a/venus-shared/actors/builtin/market/actor.go.template b/venus-shared/actors/builtin/market/actor.go.template index 6f76f58957..aec631c364 100644 --- a/venus-shared/actors/builtin/market/actor.go.template +++ b/venus-shared/actors/builtin/market/actor.go.template @@ -7,7 +7,7 @@ import ( "unicode/utf8" "github.com/filecoin-project/go-state-types/network" - "golang.org/x/xerrors" + "fmt" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" @@ -37,7 +37,7 @@ var ( func Load(store adt.Store, act *types.Actor) (State, error) { if name, av, ok := actors.GetActorMetaByCode(act.Code); ok { if name != actors.MarketKey { - return nil, xerrors.Errorf("actor code is not market: %s", name) + return nil, fmt.Errorf("actor code is not market: %s", name) } switch av { @@ -59,7 +59,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) { @@ -69,7 +69,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) } type State interface { @@ -129,7 +129,7 @@ func DecodePublishStorageDealsReturn(b []byte, nv network.Version) (PublishStora return decodePublishStorageDealsReturn{{.}}(b) {{end}} } - return nil, xerrors.Errorf("unknown actor version %d", av) + return nil, fmt.Errorf("unknown actor version %d", av) } type DealProposal = markettypes.DealProposal diff --git a/venus-shared/actors/builtin/market/state.sep.go.template b/venus-shared/actors/builtin/market/state.sep.go.template index 62d260bfe3..d2492352e8 100644 --- a/venus-shared/actors/builtin/market/state.sep.go.template +++ b/venus-shared/actors/builtin/market/state.sep.go.template @@ -9,7 +9,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" {{if (ge .v 6)}} rlepluslazy "github.com/filecoin-project/go-bitfield/rle" "github.com/filecoin-project/go-bitfield" @@ -222,7 +222,7 @@ func (s *dealProposals{{.v}}) Get(dealID abi.DealID) (*DealProposal, bool, error proposal, err := fromV{{.v}}DealProposal(proposal{{.v}}) if err != nil { - return nil, true, xerrors.Errorf("decoding proposal: %w", err) + return nil, true, fmt.Errorf("decoding proposal: %w", err) } return &proposal, true, nil @@ -233,7 +233,7 @@ func (s *dealProposals{{.v}}) ForEach(cb func(dealID abi.DealID, dp DealProposal return s.Array.ForEach(&dp{{.v}}, func(idx int64) error { dp, err := fromV{{.v}}DealProposal(dp{{.v}}) if err != nil { - return xerrors.Errorf("decoding proposal: %w", err) + return fmt.Errorf("decoding proposal: %w", err) } return cb(abi.DealID(idx), dp) @@ -265,7 +265,7 @@ func fromV{{.v}}DealProposal(v{{.v}} market{{.v}}.DealProposal) (DealProposal, e label, err := fromV{{.v}}Label(v{{.v}}.Label) {{end}} if err != nil { - return DealProposal{}, xerrors.Errorf("error setting deal label: %w", err) + return DealProposal{}, fmt.Errorf("error setting deal label: %w", err) } return DealProposal{ @@ -291,14 +291,14 @@ func fromV{{.v}}DealProposal(v{{.v}} market{{.v}}.DealProposal) (DealProposal, e if v{{.v}}.IsString() { str, err := v{{.v}}.ToString() if err != nil { - return markettypes.EmptyDealLabel, xerrors.Errorf("failed to convert string label to string: %w", err) + return markettypes.EmptyDealLabel, fmt.Errorf("failed to convert string label to string: %w", err) } return markettypes.NewLabelFromString(str) } bs, err := v{{.v}}.ToBytes() if err != nil { - return markettypes.EmptyDealLabel, xerrors.Errorf("failed to convert bytes label to bytes: %w", err) + return markettypes.EmptyDealLabel, fmt.Errorf("failed to convert bytes label to bytes: %w", err) } return markettypes.NewLabelFromBytes(bs) } @@ -315,7 +315,7 @@ var _ PublishStorageDealsReturn = (*publishStorageDealsReturn{{.v}})(nil) func decodePublishStorageDealsReturn{{.v}}(b []byte) (PublishStorageDealsReturn, error) { var retval market{{.v}}.PublishStorageDealsReturn if err := retval.UnmarshalCBOR(bytes.NewReader(b)); err != nil { - return nil, xerrors.Errorf("failed to unmarshal PublishStorageDealsReturn: %w", err) + return nil, fmt.Errorf("failed to unmarshal PublishStorageDealsReturn: %w", err) } return &publishStorageDealsReturn{{.v}}{retval}, nil diff --git a/venus-shared/actors/builtin/market/state.v0.go b/venus-shared/actors/builtin/market/state.v0.go index 390975379e..b3ddbbe4d2 100644 --- a/venus-shared/actors/builtin/market/state.v0.go +++ b/venus-shared/actors/builtin/market/state.v0.go @@ -5,11 +5,12 @@ package market import ( "bytes" + "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" types "github.com/filecoin-project/venus/venus-shared/internal" @@ -204,7 +205,7 @@ func (s *dealProposals0) Get(dealID abi.DealID) (*DealProposal, bool, error) { proposal, err := fromV0DealProposal(proposal0) if err != nil { - return nil, true, xerrors.Errorf("decoding proposal: %w", err) + return nil, true, fmt.Errorf("decoding proposal: %w", err) } return &proposal, true, nil @@ -215,7 +216,7 @@ func (s *dealProposals0) ForEach(cb func(dealID abi.DealID, dp DealProposal) err return s.Array.ForEach(&dp0, func(idx int64) error { dp, err := fromV0DealProposal(dp0) if err != nil { - return xerrors.Errorf("decoding proposal: %w", err) + return fmt.Errorf("decoding proposal: %w", err) } return cb(abi.DealID(idx), dp) @@ -245,7 +246,7 @@ func fromV0DealProposal(v0 market0.DealProposal) (DealProposal, error) { label, err := labelFromGoString(v0.Label) if err != nil { - return DealProposal{}, xerrors.Errorf("error setting deal label: %w", err) + return DealProposal{}, fmt.Errorf("error setting deal label: %w", err) } return DealProposal{ @@ -275,7 +276,7 @@ var _ PublishStorageDealsReturn = (*publishStorageDealsReturn0)(nil) func decodePublishStorageDealsReturn0(b []byte) (PublishStorageDealsReturn, error) { var retval market0.PublishStorageDealsReturn if err := retval.UnmarshalCBOR(bytes.NewReader(b)); err != nil { - return nil, xerrors.Errorf("failed to unmarshal PublishStorageDealsReturn: %w", err) + return nil, fmt.Errorf("failed to unmarshal PublishStorageDealsReturn: %w", err) } return &publishStorageDealsReturn0{retval}, nil diff --git a/venus-shared/actors/builtin/market/state.v2.go b/venus-shared/actors/builtin/market/state.v2.go index 6c1e14dfa0..06630ba249 100644 --- a/venus-shared/actors/builtin/market/state.v2.go +++ b/venus-shared/actors/builtin/market/state.v2.go @@ -5,11 +5,12 @@ package market import ( "bytes" + "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" types "github.com/filecoin-project/venus/venus-shared/internal" @@ -204,7 +205,7 @@ func (s *dealProposals2) Get(dealID abi.DealID) (*DealProposal, bool, error) { proposal, err := fromV2DealProposal(proposal2) if err != nil { - return nil, true, xerrors.Errorf("decoding proposal: %w", err) + return nil, true, fmt.Errorf("decoding proposal: %w", err) } return &proposal, true, nil @@ -215,7 +216,7 @@ func (s *dealProposals2) ForEach(cb func(dealID abi.DealID, dp DealProposal) err return s.Array.ForEach(&dp2, func(idx int64) error { dp, err := fromV2DealProposal(dp2) if err != nil { - return xerrors.Errorf("decoding proposal: %w", err) + return fmt.Errorf("decoding proposal: %w", err) } return cb(abi.DealID(idx), dp) @@ -245,7 +246,7 @@ func fromV2DealProposal(v2 market2.DealProposal) (DealProposal, error) { label, err := labelFromGoString(v2.Label) if err != nil { - return DealProposal{}, xerrors.Errorf("error setting deal label: %w", err) + return DealProposal{}, fmt.Errorf("error setting deal label: %w", err) } return DealProposal{ @@ -275,7 +276,7 @@ var _ PublishStorageDealsReturn = (*publishStorageDealsReturn2)(nil) func decodePublishStorageDealsReturn2(b []byte) (PublishStorageDealsReturn, error) { var retval market2.PublishStorageDealsReturn if err := retval.UnmarshalCBOR(bytes.NewReader(b)); err != nil { - return nil, xerrors.Errorf("failed to unmarshal PublishStorageDealsReturn: %w", err) + return nil, fmt.Errorf("failed to unmarshal PublishStorageDealsReturn: %w", err) } return &publishStorageDealsReturn2{retval}, nil diff --git a/venus-shared/actors/builtin/market/state.v3.go b/venus-shared/actors/builtin/market/state.v3.go index 130d4675d4..b46f3069d7 100644 --- a/venus-shared/actors/builtin/market/state.v3.go +++ b/venus-shared/actors/builtin/market/state.v3.go @@ -5,11 +5,12 @@ package market import ( "bytes" + "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" types "github.com/filecoin-project/venus/venus-shared/internal" @@ -199,7 +200,7 @@ func (s *dealProposals3) Get(dealID abi.DealID) (*DealProposal, bool, error) { proposal, err := fromV3DealProposal(proposal3) if err != nil { - return nil, true, xerrors.Errorf("decoding proposal: %w", err) + return nil, true, fmt.Errorf("decoding proposal: %w", err) } return &proposal, true, nil @@ -210,7 +211,7 @@ func (s *dealProposals3) ForEach(cb func(dealID abi.DealID, dp DealProposal) err return s.Array.ForEach(&dp3, func(idx int64) error { dp, err := fromV3DealProposal(dp3) if err != nil { - return xerrors.Errorf("decoding proposal: %w", err) + return fmt.Errorf("decoding proposal: %w", err) } return cb(abi.DealID(idx), dp) @@ -240,7 +241,7 @@ func fromV3DealProposal(v3 market3.DealProposal) (DealProposal, error) { label, err := labelFromGoString(v3.Label) if err != nil { - return DealProposal{}, xerrors.Errorf("error setting deal label: %w", err) + return DealProposal{}, fmt.Errorf("error setting deal label: %w", err) } return DealProposal{ @@ -270,7 +271,7 @@ var _ PublishStorageDealsReturn = (*publishStorageDealsReturn3)(nil) func decodePublishStorageDealsReturn3(b []byte) (PublishStorageDealsReturn, error) { var retval market3.PublishStorageDealsReturn if err := retval.UnmarshalCBOR(bytes.NewReader(b)); err != nil { - return nil, xerrors.Errorf("failed to unmarshal PublishStorageDealsReturn: %w", err) + return nil, fmt.Errorf("failed to unmarshal PublishStorageDealsReturn: %w", err) } return &publishStorageDealsReturn3{retval}, nil diff --git a/venus-shared/actors/builtin/market/state.v4.go b/venus-shared/actors/builtin/market/state.v4.go index 8cda0b006e..88225a6d84 100644 --- a/venus-shared/actors/builtin/market/state.v4.go +++ b/venus-shared/actors/builtin/market/state.v4.go @@ -5,11 +5,12 @@ package market import ( "bytes" + "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" types "github.com/filecoin-project/venus/venus-shared/internal" @@ -199,7 +200,7 @@ func (s *dealProposals4) Get(dealID abi.DealID) (*DealProposal, bool, error) { proposal, err := fromV4DealProposal(proposal4) if err != nil { - return nil, true, xerrors.Errorf("decoding proposal: %w", err) + return nil, true, fmt.Errorf("decoding proposal: %w", err) } return &proposal, true, nil @@ -210,7 +211,7 @@ func (s *dealProposals4) ForEach(cb func(dealID abi.DealID, dp DealProposal) err return s.Array.ForEach(&dp4, func(idx int64) error { dp, err := fromV4DealProposal(dp4) if err != nil { - return xerrors.Errorf("decoding proposal: %w", err) + return fmt.Errorf("decoding proposal: %w", err) } return cb(abi.DealID(idx), dp) @@ -240,7 +241,7 @@ func fromV4DealProposal(v4 market4.DealProposal) (DealProposal, error) { label, err := labelFromGoString(v4.Label) if err != nil { - return DealProposal{}, xerrors.Errorf("error setting deal label: %w", err) + return DealProposal{}, fmt.Errorf("error setting deal label: %w", err) } return DealProposal{ @@ -270,7 +271,7 @@ var _ PublishStorageDealsReturn = (*publishStorageDealsReturn4)(nil) func decodePublishStorageDealsReturn4(b []byte) (PublishStorageDealsReturn, error) { var retval market4.PublishStorageDealsReturn if err := retval.UnmarshalCBOR(bytes.NewReader(b)); err != nil { - return nil, xerrors.Errorf("failed to unmarshal PublishStorageDealsReturn: %w", err) + return nil, fmt.Errorf("failed to unmarshal PublishStorageDealsReturn: %w", err) } return &publishStorageDealsReturn4{retval}, nil diff --git a/venus-shared/actors/builtin/market/state.v5.go b/venus-shared/actors/builtin/market/state.v5.go index cfdb18ee8d..0c20925266 100644 --- a/venus-shared/actors/builtin/market/state.v5.go +++ b/venus-shared/actors/builtin/market/state.v5.go @@ -5,11 +5,12 @@ package market import ( "bytes" + "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" types "github.com/filecoin-project/venus/venus-shared/internal" @@ -199,7 +200,7 @@ func (s *dealProposals5) Get(dealID abi.DealID) (*DealProposal, bool, error) { proposal, err := fromV5DealProposal(proposal5) if err != nil { - return nil, true, xerrors.Errorf("decoding proposal: %w", err) + return nil, true, fmt.Errorf("decoding proposal: %w", err) } return &proposal, true, nil @@ -210,7 +211,7 @@ func (s *dealProposals5) ForEach(cb func(dealID abi.DealID, dp DealProposal) err return s.Array.ForEach(&dp5, func(idx int64) error { dp, err := fromV5DealProposal(dp5) if err != nil { - return xerrors.Errorf("decoding proposal: %w", err) + return fmt.Errorf("decoding proposal: %w", err) } return cb(abi.DealID(idx), dp) @@ -240,7 +241,7 @@ func fromV5DealProposal(v5 market5.DealProposal) (DealProposal, error) { label, err := labelFromGoString(v5.Label) if err != nil { - return DealProposal{}, xerrors.Errorf("error setting deal label: %w", err) + return DealProposal{}, fmt.Errorf("error setting deal label: %w", err) } return DealProposal{ @@ -270,7 +271,7 @@ var _ PublishStorageDealsReturn = (*publishStorageDealsReturn5)(nil) func decodePublishStorageDealsReturn5(b []byte) (PublishStorageDealsReturn, error) { var retval market5.PublishStorageDealsReturn if err := retval.UnmarshalCBOR(bytes.NewReader(b)); err != nil { - return nil, xerrors.Errorf("failed to unmarshal PublishStorageDealsReturn: %w", err) + return nil, fmt.Errorf("failed to unmarshal PublishStorageDealsReturn: %w", err) } return &publishStorageDealsReturn5{retval}, nil diff --git a/venus-shared/actors/builtin/market/state.v6.go b/venus-shared/actors/builtin/market/state.v6.go index 5742f6da0b..cd85d9e1fd 100644 --- a/venus-shared/actors/builtin/market/state.v6.go +++ b/venus-shared/actors/builtin/market/state.v6.go @@ -5,11 +5,12 @@ package market import ( "bytes" + "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/go-bitfield" rlepluslazy "github.com/filecoin-project/go-bitfield/rle" @@ -202,7 +203,7 @@ func (s *dealProposals6) Get(dealID abi.DealID) (*DealProposal, bool, error) { proposal, err := fromV6DealProposal(proposal6) if err != nil { - return nil, true, xerrors.Errorf("decoding proposal: %w", err) + return nil, true, fmt.Errorf("decoding proposal: %w", err) } return &proposal, true, nil @@ -213,7 +214,7 @@ func (s *dealProposals6) ForEach(cb func(dealID abi.DealID, dp DealProposal) err return s.Array.ForEach(&dp6, func(idx int64) error { dp, err := fromV6DealProposal(dp6) if err != nil { - return xerrors.Errorf("decoding proposal: %w", err) + return fmt.Errorf("decoding proposal: %w", err) } return cb(abi.DealID(idx), dp) @@ -243,7 +244,7 @@ func fromV6DealProposal(v6 market6.DealProposal) (DealProposal, error) { label, err := labelFromGoString(v6.Label) if err != nil { - return DealProposal{}, xerrors.Errorf("error setting deal label: %w", err) + return DealProposal{}, fmt.Errorf("error setting deal label: %w", err) } return DealProposal{ @@ -273,7 +274,7 @@ var _ PublishStorageDealsReturn = (*publishStorageDealsReturn6)(nil) func decodePublishStorageDealsReturn6(b []byte) (PublishStorageDealsReturn, error) { var retval market6.PublishStorageDealsReturn if err := retval.UnmarshalCBOR(bytes.NewReader(b)); err != nil { - return nil, xerrors.Errorf("failed to unmarshal PublishStorageDealsReturn: %w", err) + return nil, fmt.Errorf("failed to unmarshal PublishStorageDealsReturn: %w", err) } return &publishStorageDealsReturn6{retval}, nil diff --git a/venus-shared/actors/builtin/market/state.v7.go b/venus-shared/actors/builtin/market/state.v7.go index 5289c5618b..4c3e23860d 100644 --- a/venus-shared/actors/builtin/market/state.v7.go +++ b/venus-shared/actors/builtin/market/state.v7.go @@ -5,11 +5,12 @@ package market import ( "bytes" + "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/go-bitfield" rlepluslazy "github.com/filecoin-project/go-bitfield/rle" @@ -202,7 +203,7 @@ func (s *dealProposals7) Get(dealID abi.DealID) (*DealProposal, bool, error) { proposal, err := fromV7DealProposal(proposal7) if err != nil { - return nil, true, xerrors.Errorf("decoding proposal: %w", err) + return nil, true, fmt.Errorf("decoding proposal: %w", err) } return &proposal, true, nil @@ -213,7 +214,7 @@ func (s *dealProposals7) ForEach(cb func(dealID abi.DealID, dp DealProposal) err return s.Array.ForEach(&dp7, func(idx int64) error { dp, err := fromV7DealProposal(dp7) if err != nil { - return xerrors.Errorf("decoding proposal: %w", err) + return fmt.Errorf("decoding proposal: %w", err) } return cb(abi.DealID(idx), dp) @@ -243,7 +244,7 @@ func fromV7DealProposal(v7 market7.DealProposal) (DealProposal, error) { label, err := labelFromGoString(v7.Label) if err != nil { - return DealProposal{}, xerrors.Errorf("error setting deal label: %w", err) + return DealProposal{}, fmt.Errorf("error setting deal label: %w", err) } return DealProposal{ @@ -273,7 +274,7 @@ var _ PublishStorageDealsReturn = (*publishStorageDealsReturn7)(nil) func decodePublishStorageDealsReturn7(b []byte) (PublishStorageDealsReturn, error) { var retval market7.PublishStorageDealsReturn if err := retval.UnmarshalCBOR(bytes.NewReader(b)); err != nil { - return nil, xerrors.Errorf("failed to unmarshal PublishStorageDealsReturn: %w", err) + return nil, fmt.Errorf("failed to unmarshal PublishStorageDealsReturn: %w", err) } return &publishStorageDealsReturn7{retval}, nil diff --git a/venus-shared/actors/builtin/market/state.v8.go b/venus-shared/actors/builtin/market/state.v8.go index 0514a7fe4f..8995bdc36f 100644 --- a/venus-shared/actors/builtin/market/state.v8.go +++ b/venus-shared/actors/builtin/market/state.v8.go @@ -5,11 +5,12 @@ package market import ( "bytes" + "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/go-bitfield" rlepluslazy "github.com/filecoin-project/go-bitfield/rle" @@ -203,7 +204,7 @@ func (s *dealProposals8) Get(dealID abi.DealID) (*DealProposal, bool, error) { proposal, err := fromV8DealProposal(proposal8) if err != nil { - return nil, true, xerrors.Errorf("decoding proposal: %w", err) + return nil, true, fmt.Errorf("decoding proposal: %w", err) } return &proposal, true, nil @@ -214,7 +215,7 @@ func (s *dealProposals8) ForEach(cb func(dealID abi.DealID, dp DealProposal) err return s.Array.ForEach(&dp8, func(idx int64) error { dp, err := fromV8DealProposal(dp8) if err != nil { - return xerrors.Errorf("decoding proposal: %w", err) + return fmt.Errorf("decoding proposal: %w", err) } return cb(abi.DealID(idx), dp) @@ -244,7 +245,7 @@ func fromV8DealProposal(v8 market8.DealProposal) (DealProposal, error) { label, err := fromV8Label(v8.Label) if err != nil { - return DealProposal{}, xerrors.Errorf("error setting deal label: %w", err) + return DealProposal{}, fmt.Errorf("error setting deal label: %w", err) } return DealProposal{ @@ -269,14 +270,14 @@ func fromV8Label(v8 market8.DealLabel) (DealLabel, error) { if v8.IsString() { str, err := v8.ToString() if err != nil { - return markettypes.EmptyDealLabel, xerrors.Errorf("failed to convert string label to string: %w", err) + return markettypes.EmptyDealLabel, fmt.Errorf("failed to convert string label to string: %w", err) } return markettypes.NewLabelFromString(str) } bs, err := v8.ToBytes() if err != nil { - return markettypes.EmptyDealLabel, xerrors.Errorf("failed to convert bytes label to bytes: %w", err) + return markettypes.EmptyDealLabel, fmt.Errorf("failed to convert bytes label to bytes: %w", err) } return markettypes.NewLabelFromBytes(bs) } @@ -290,7 +291,7 @@ var _ PublishStorageDealsReturn = (*publishStorageDealsReturn8)(nil) func decodePublishStorageDealsReturn8(b []byte) (PublishStorageDealsReturn, error) { var retval market8.PublishStorageDealsReturn if err := retval.UnmarshalCBOR(bytes.NewReader(b)); err != nil { - return nil, xerrors.Errorf("failed to unmarshal PublishStorageDealsReturn: %w", err) + return nil, fmt.Errorf("failed to unmarshal PublishStorageDealsReturn: %w", err) } return &publishStorageDealsReturn8{retval}, nil diff --git a/venus-shared/actors/builtin/market/state.v9.go b/venus-shared/actors/builtin/market/state.v9.go index 42288b731e..bc66a7f2e5 100644 --- a/venus-shared/actors/builtin/market/state.v9.go +++ b/venus-shared/actors/builtin/market/state.v9.go @@ -5,11 +5,12 @@ package market import ( "bytes" + "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/go-bitfield" rlepluslazy "github.com/filecoin-project/go-bitfield/rle" @@ -203,7 +204,7 @@ func (s *dealProposals9) Get(dealID abi.DealID) (*DealProposal, bool, error) { proposal, err := fromV9DealProposal(proposal9) if err != nil { - return nil, true, xerrors.Errorf("decoding proposal: %w", err) + return nil, true, fmt.Errorf("decoding proposal: %w", err) } return &proposal, true, nil @@ -214,7 +215,7 @@ func (s *dealProposals9) ForEach(cb func(dealID abi.DealID, dp DealProposal) err return s.Array.ForEach(&dp9, func(idx int64) error { dp, err := fromV9DealProposal(dp9) if err != nil { - return xerrors.Errorf("decoding proposal: %w", err) + return fmt.Errorf("decoding proposal: %w", err) } return cb(abi.DealID(idx), dp) @@ -244,7 +245,7 @@ func fromV9DealProposal(v9 market9.DealProposal) (DealProposal, error) { label, err := fromV9Label(v9.Label) if err != nil { - return DealProposal{}, xerrors.Errorf("error setting deal label: %w", err) + return DealProposal{}, fmt.Errorf("error setting deal label: %w", err) } return DealProposal{ @@ -269,14 +270,14 @@ func fromV9Label(v9 market9.DealLabel) (DealLabel, error) { if v9.IsString() { str, err := v9.ToString() if err != nil { - return markettypes.EmptyDealLabel, xerrors.Errorf("failed to convert string label to string: %w", err) + return markettypes.EmptyDealLabel, fmt.Errorf("failed to convert string label to string: %w", err) } return markettypes.NewLabelFromString(str) } bs, err := v9.ToBytes() if err != nil { - return markettypes.EmptyDealLabel, xerrors.Errorf("failed to convert bytes label to bytes: %w", err) + return markettypes.EmptyDealLabel, fmt.Errorf("failed to convert bytes label to bytes: %w", err) } return markettypes.NewLabelFromBytes(bs) } @@ -290,7 +291,7 @@ var _ PublishStorageDealsReturn = (*publishStorageDealsReturn9)(nil) func decodePublishStorageDealsReturn9(b []byte) (PublishStorageDealsReturn, error) { var retval market9.PublishStorageDealsReturn if err := retval.UnmarshalCBOR(bytes.NewReader(b)); err != nil { - return nil, xerrors.Errorf("failed to unmarshal PublishStorageDealsReturn: %w", err) + return nil, fmt.Errorf("failed to unmarshal PublishStorageDealsReturn: %w", err) } return &publishStorageDealsReturn9{retval}, nil diff --git a/venus-shared/actors/builtin/miner/actor.go b/venus-shared/actors/builtin/miner/actor.go index d86c48794b..bb7e4d2300 100644 --- a/venus-shared/actors/builtin/miner/actor.go +++ b/venus-shared/actors/builtin/miner/actor.go @@ -3,12 +3,13 @@ package miner import ( + "fmt" + actorstypes "github.com/filecoin-project/go-state-types/actors" "github.com/filecoin-project/go-state-types/big" "github.com/filecoin-project/go-state-types/network" "github.com/filecoin-project/venus/venus-shared/actors" cbg "github.com/whyrusleeping/cbor-gen" - "golang.org/x/xerrors" "github.com/filecoin-project/go-bitfield" "github.com/filecoin-project/go-state-types/abi" @@ -38,7 +39,7 @@ import ( func Load(store adt.Store, act *types.Actor) (State, error) { if name, av, ok := actors.GetActorMetaByCode(act.Code); ok { if name != actors.MinerKey { - return nil, xerrors.Errorf("actor code is not miner: %s", name) + return nil, fmt.Errorf("actor code is not miner: %s", name) } switch av { @@ -77,7 +78,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 actors.Version) (State, error) { @@ -111,7 +112,7 @@ func MakeState(store adt.Store, av actors.Version) (State, error) { return make9(store) } - return nil, xerrors.Errorf("unknown actor version %d", av) + return nil, fmt.Errorf("unknown actor version %d", av) } type State interface { @@ -214,7 +215,7 @@ func PreferredSealProofTypeFromWindowPoStType(nver network.Version, proof abi.Re case abi.RegisteredPoStProof_StackedDrgWindow64GiBV1: return abi.RegisteredSealProof_StackedDrg64GiBV1, nil default: - return -1, xerrors.Errorf("unrecognized window post type: %d", proof) + return -1, fmt.Errorf("unrecognized window post type: %d", proof) } } @@ -230,7 +231,7 @@ func PreferredSealProofTypeFromWindowPoStType(nver network.Version, proof abi.Re case abi.RegisteredPoStProof_StackedDrgWindow64GiBV1: return abi.RegisteredSealProof_StackedDrg64GiBV1_1, nil default: - return -1, xerrors.Errorf("unrecognized window post type: %d", proof) + return -1, fmt.Errorf("unrecognized window post type: %d", proof) } } @@ -247,7 +248,7 @@ func WinningPoStProofTypeFromWindowPoStProofType(nver network.Version, proof abi case abi.RegisteredPoStProof_StackedDrgWindow64GiBV1: return abi.RegisteredPoStProof_StackedDrgWinning64GiBV1, nil default: - return -1, xerrors.Errorf("unknown proof type %d", proof) + return -1, fmt.Errorf("unknown proof type %d", proof) } } diff --git a/venus-shared/actors/builtin/miner/actor.go.template b/venus-shared/actors/builtin/miner/actor.go.template index 65a2b2bae6..0d84d17fb3 100644 --- a/venus-shared/actors/builtin/miner/actor.go.template +++ b/venus-shared/actors/builtin/miner/actor.go.template @@ -8,7 +8,7 @@ import ( "github.com/filecoin-project/go-state-types/network" "github.com/filecoin-project/venus/venus-shared/actors" cbg "github.com/whyrusleeping/cbor-gen" - "golang.org/x/xerrors" + "fmt" "github.com/filecoin-project/go-bitfield" "github.com/filecoin-project/go-state-types/abi" @@ -30,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.MinerKey { - return nil, xerrors.Errorf("actor code is not miner: %s", name) + return nil, fmt.Errorf("actor code is not miner: %s", name) } switch av { @@ -52,7 +52,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 actors.Version) (State, error) { @@ -62,7 +62,7 @@ func MakeState(store adt.Store, av actors.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) } type State interface { @@ -165,7 +165,7 @@ func PreferredSealProofTypeFromWindowPoStType(nver network.Version, proof abi.Re case abi.RegisteredPoStProof_StackedDrgWindow64GiBV1: return abi.RegisteredSealProof_StackedDrg64GiBV1, nil default: - return -1, xerrors.Errorf("unrecognized window post type: %d", proof) + return -1, fmt.Errorf("unrecognized window post type: %d", proof) } } @@ -181,7 +181,7 @@ func PreferredSealProofTypeFromWindowPoStType(nver network.Version, proof abi.Re case abi.RegisteredPoStProof_StackedDrgWindow64GiBV1: return abi.RegisteredSealProof_StackedDrg64GiBV1_1, nil default: - return -1, xerrors.Errorf("unrecognized window post type: %d", proof) + return -1, fmt.Errorf("unrecognized window post type: %d", proof) } } @@ -198,7 +198,7 @@ func WinningPoStProofTypeFromWindowPoStProofType(nver network.Version, proof abi case abi.RegisteredPoStProof_StackedDrgWindow64GiBV1: return abi.RegisteredPoStProof_StackedDrgWinning64GiBV1, nil default: - return -1, xerrors.Errorf("unknown proof type %d", proof) + return -1, fmt.Errorf("unknown proof type %d", proof) } } diff --git a/venus-shared/actors/builtin/miner/state.sep.go.template b/venus-shared/actors/builtin/miner/state.sep.go.template index ea0281bcaa..f43d4098b6 100644 --- a/venus-shared/actors/builtin/miner/state.sep.go.template +++ b/venus-shared/actors/builtin/miner/state.sep.go.template @@ -14,7 +14,7 @@ import ( "github.com/filecoin-project/go-state-types/dline" "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" minertypes "github.com/filecoin-project/go-state-types/builtin/v{{.latestVersion}}/miner" @@ -67,7 +67,7 @@ type partition{{.v}} struct { func (s *state{{.v}}) AvailableBalance(bal abi.TokenAmount) (available abi.TokenAmount, err error) { defer func() { if r := recover(); r != nil { - err = xerrors.Errorf("failed to get available balance: %w", r) + err = fmt.Errorf("failed to get available balance: %w", r) available = abi.NewTokenAmount(0) } }() @@ -212,7 +212,7 @@ func (s *state{{.v}}) GetSectorExpiration(num abi.SectorNumber) (*SectorExpirati return nil, err } if out.Early == 0 && out.OnTime == 0 { - return nil, xerrors.Errorf("failed to find sector %d", num) + return nil, fmt.Errorf("failed to find sector %d", num) } return &out, nil } diff --git a/venus-shared/actors/builtin/miner/state.v0.go b/venus-shared/actors/builtin/miner/state.v0.go index d98620f1b8..c2a380bcd9 100644 --- a/venus-shared/actors/builtin/miner/state.v0.go +++ b/venus-shared/actors/builtin/miner/state.v0.go @@ -8,13 +8,14 @@ import ( "github.com/filecoin-project/go-state-types/big" + "fmt" + "github.com/filecoin-project/go-bitfield" rle "github.com/filecoin-project/go-bitfield/rle" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/dline" "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" - "golang.org/x/xerrors" minertypes "github.com/filecoin-project/go-state-types/builtin/v9/miner" "github.com/filecoin-project/venus/venus-shared/actors/adt" @@ -58,7 +59,7 @@ type partition0 struct { func (s *state0) AvailableBalance(bal abi.TokenAmount) (available abi.TokenAmount, err error) { defer func() { if r := recover(); r != nil { - err = xerrors.Errorf("failed to get available balance: %w", r) + err = fmt.Errorf("failed to get available balance: %w", r) available = abi.NewTokenAmount(0) } }() @@ -193,7 +194,7 @@ func (s *state0) GetSectorExpiration(num abi.SectorNumber) (*SectorExpiration, e return nil, err } if out.Early == 0 && out.OnTime == 0 { - return nil, xerrors.Errorf("failed to find sector %d", num) + return nil, fmt.Errorf("failed to find sector %d", num) } return &out, nil } diff --git a/venus-shared/actors/builtin/miner/state.v2.go b/venus-shared/actors/builtin/miner/state.v2.go index ff14a3f7da..124817ce99 100644 --- a/venus-shared/actors/builtin/miner/state.v2.go +++ b/venus-shared/actors/builtin/miner/state.v2.go @@ -6,13 +6,14 @@ import ( "bytes" "errors" + "fmt" + "github.com/filecoin-project/go-bitfield" rle "github.com/filecoin-project/go-bitfield/rle" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/dline" "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" - "golang.org/x/xerrors" minertypes "github.com/filecoin-project/go-state-types/builtin/v9/miner" "github.com/filecoin-project/venus/venus-shared/actors/adt" @@ -56,7 +57,7 @@ type partition2 struct { func (s *state2) AvailableBalance(bal abi.TokenAmount) (available abi.TokenAmount, err error) { defer func() { if r := recover(); r != nil { - err = xerrors.Errorf("failed to get available balance: %w", r) + err = fmt.Errorf("failed to get available balance: %w", r) available = abi.NewTokenAmount(0) } }() @@ -191,7 +192,7 @@ func (s *state2) GetSectorExpiration(num abi.SectorNumber) (*SectorExpiration, e return nil, err } if out.Early == 0 && out.OnTime == 0 { - return nil, xerrors.Errorf("failed to find sector %d", num) + return nil, fmt.Errorf("failed to find sector %d", num) } return &out, nil } diff --git a/venus-shared/actors/builtin/miner/state.v3.go b/venus-shared/actors/builtin/miner/state.v3.go index 127fc8a618..9728adaede 100644 --- a/venus-shared/actors/builtin/miner/state.v3.go +++ b/venus-shared/actors/builtin/miner/state.v3.go @@ -6,13 +6,14 @@ import ( "bytes" "errors" + "fmt" + "github.com/filecoin-project/go-bitfield" rle "github.com/filecoin-project/go-bitfield/rle" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/dline" "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" - "golang.org/x/xerrors" minertypes "github.com/filecoin-project/go-state-types/builtin/v9/miner" "github.com/filecoin-project/venus/venus-shared/actors/adt" @@ -58,7 +59,7 @@ type partition3 struct { func (s *state3) AvailableBalance(bal abi.TokenAmount) (available abi.TokenAmount, err error) { defer func() { if r := recover(); r != nil { - err = xerrors.Errorf("failed to get available balance: %w", r) + err = fmt.Errorf("failed to get available balance: %w", r) available = abi.NewTokenAmount(0) } }() @@ -193,7 +194,7 @@ func (s *state3) GetSectorExpiration(num abi.SectorNumber) (*SectorExpiration, e return nil, err } if out.Early == 0 && out.OnTime == 0 { - return nil, xerrors.Errorf("failed to find sector %d", num) + return nil, fmt.Errorf("failed to find sector %d", num) } return &out, nil } diff --git a/venus-shared/actors/builtin/miner/state.v4.go b/venus-shared/actors/builtin/miner/state.v4.go index 354f4bf136..d83ebc194b 100644 --- a/venus-shared/actors/builtin/miner/state.v4.go +++ b/venus-shared/actors/builtin/miner/state.v4.go @@ -6,13 +6,14 @@ import ( "bytes" "errors" + "fmt" + "github.com/filecoin-project/go-bitfield" rle "github.com/filecoin-project/go-bitfield/rle" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/dline" "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" - "golang.org/x/xerrors" minertypes "github.com/filecoin-project/go-state-types/builtin/v9/miner" "github.com/filecoin-project/venus/venus-shared/actors/adt" @@ -58,7 +59,7 @@ type partition4 struct { func (s *state4) AvailableBalance(bal abi.TokenAmount) (available abi.TokenAmount, err error) { defer func() { if r := recover(); r != nil { - err = xerrors.Errorf("failed to get available balance: %w", r) + err = fmt.Errorf("failed to get available balance: %w", r) available = abi.NewTokenAmount(0) } }() @@ -193,7 +194,7 @@ func (s *state4) GetSectorExpiration(num abi.SectorNumber) (*SectorExpiration, e return nil, err } if out.Early == 0 && out.OnTime == 0 { - return nil, xerrors.Errorf("failed to find sector %d", num) + return nil, fmt.Errorf("failed to find sector %d", num) } return &out, nil } diff --git a/venus-shared/actors/builtin/miner/state.v5.go b/venus-shared/actors/builtin/miner/state.v5.go index 7c286ab327..0dd3f59df5 100644 --- a/venus-shared/actors/builtin/miner/state.v5.go +++ b/venus-shared/actors/builtin/miner/state.v5.go @@ -6,13 +6,14 @@ import ( "bytes" "errors" + "fmt" + "github.com/filecoin-project/go-bitfield" rle "github.com/filecoin-project/go-bitfield/rle" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/dline" "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" - "golang.org/x/xerrors" minertypes "github.com/filecoin-project/go-state-types/builtin/v9/miner" "github.com/filecoin-project/venus/venus-shared/actors/adt" @@ -58,7 +59,7 @@ type partition5 struct { func (s *state5) AvailableBalance(bal abi.TokenAmount) (available abi.TokenAmount, err error) { defer func() { if r := recover(); r != nil { - err = xerrors.Errorf("failed to get available balance: %w", r) + err = fmt.Errorf("failed to get available balance: %w", r) available = abi.NewTokenAmount(0) } }() @@ -193,7 +194,7 @@ func (s *state5) GetSectorExpiration(num abi.SectorNumber) (*SectorExpiration, e return nil, err } if out.Early == 0 && out.OnTime == 0 { - return nil, xerrors.Errorf("failed to find sector %d", num) + return nil, fmt.Errorf("failed to find sector %d", num) } return &out, nil } diff --git a/venus-shared/actors/builtin/miner/state.v6.go b/venus-shared/actors/builtin/miner/state.v6.go index 19e0a492d0..bae344a9bb 100644 --- a/venus-shared/actors/builtin/miner/state.v6.go +++ b/venus-shared/actors/builtin/miner/state.v6.go @@ -6,13 +6,14 @@ import ( "bytes" "errors" + "fmt" + "github.com/filecoin-project/go-bitfield" rle "github.com/filecoin-project/go-bitfield/rle" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/dline" "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" - "golang.org/x/xerrors" minertypes "github.com/filecoin-project/go-state-types/builtin/v9/miner" "github.com/filecoin-project/venus/venus-shared/actors/adt" @@ -58,7 +59,7 @@ type partition6 struct { func (s *state6) AvailableBalance(bal abi.TokenAmount) (available abi.TokenAmount, err error) { defer func() { if r := recover(); r != nil { - err = xerrors.Errorf("failed to get available balance: %w", r) + err = fmt.Errorf("failed to get available balance: %w", r) available = abi.NewTokenAmount(0) } }() @@ -193,7 +194,7 @@ func (s *state6) GetSectorExpiration(num abi.SectorNumber) (*SectorExpiration, e return nil, err } if out.Early == 0 && out.OnTime == 0 { - return nil, xerrors.Errorf("failed to find sector %d", num) + return nil, fmt.Errorf("failed to find sector %d", num) } return &out, nil } diff --git a/venus-shared/actors/builtin/miner/state.v7.go b/venus-shared/actors/builtin/miner/state.v7.go index d258e2f6f8..117145f5a3 100644 --- a/venus-shared/actors/builtin/miner/state.v7.go +++ b/venus-shared/actors/builtin/miner/state.v7.go @@ -6,13 +6,14 @@ import ( "bytes" "errors" + "fmt" + "github.com/filecoin-project/go-bitfield" rle "github.com/filecoin-project/go-bitfield/rle" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/dline" "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" - "golang.org/x/xerrors" minertypes "github.com/filecoin-project/go-state-types/builtin/v9/miner" "github.com/filecoin-project/venus/venus-shared/actors/adt" @@ -58,7 +59,7 @@ type partition7 struct { func (s *state7) AvailableBalance(bal abi.TokenAmount) (available abi.TokenAmount, err error) { defer func() { if r := recover(); r != nil { - err = xerrors.Errorf("failed to get available balance: %w", r) + err = fmt.Errorf("failed to get available balance: %w", r) available = abi.NewTokenAmount(0) } }() @@ -192,7 +193,7 @@ func (s *state7) GetSectorExpiration(num abi.SectorNumber) (*SectorExpiration, e return nil, err } if out.Early == 0 && out.OnTime == 0 { - return nil, xerrors.Errorf("failed to find sector %d", num) + return nil, fmt.Errorf("failed to find sector %d", num) } return &out, nil } diff --git a/venus-shared/actors/builtin/miner/state.v8.go b/venus-shared/actors/builtin/miner/state.v8.go index ca0adfb058..8dfebb363d 100644 --- a/venus-shared/actors/builtin/miner/state.v8.go +++ b/venus-shared/actors/builtin/miner/state.v8.go @@ -6,13 +6,14 @@ import ( "bytes" "errors" + "fmt" + "github.com/filecoin-project/go-bitfield" rle "github.com/filecoin-project/go-bitfield/rle" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/dline" "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" - "golang.org/x/xerrors" minertypes "github.com/filecoin-project/go-state-types/builtin/v9/miner" "github.com/filecoin-project/venus/venus-shared/actors/adt" @@ -57,7 +58,7 @@ type partition8 struct { func (s *state8) AvailableBalance(bal abi.TokenAmount) (available abi.TokenAmount, err error) { defer func() { if r := recover(); r != nil { - err = xerrors.Errorf("failed to get available balance: %w", r) + err = fmt.Errorf("failed to get available balance: %w", r) available = abi.NewTokenAmount(0) } }() @@ -191,7 +192,7 @@ func (s *state8) GetSectorExpiration(num abi.SectorNumber) (*SectorExpiration, e return nil, err } if out.Early == 0 && out.OnTime == 0 { - return nil, xerrors.Errorf("failed to find sector %d", num) + return nil, fmt.Errorf("failed to find sector %d", num) } return &out, nil } diff --git a/venus-shared/actors/builtin/miner/state.v9.go b/venus-shared/actors/builtin/miner/state.v9.go index 7c7cec02bf..251a4e0fcb 100644 --- a/venus-shared/actors/builtin/miner/state.v9.go +++ b/venus-shared/actors/builtin/miner/state.v9.go @@ -6,13 +6,14 @@ import ( "bytes" "errors" + "fmt" + "github.com/filecoin-project/go-bitfield" rle "github.com/filecoin-project/go-bitfield/rle" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/dline" "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" - "golang.org/x/xerrors" minertypes "github.com/filecoin-project/go-state-types/builtin/v9/miner" "github.com/filecoin-project/venus/venus-shared/actors/adt" @@ -57,7 +58,7 @@ type partition9 struct { func (s *state9) AvailableBalance(bal abi.TokenAmount) (available abi.TokenAmount, err error) { defer func() { if r := recover(); r != nil { - err = xerrors.Errorf("failed to get available balance: %w", r) + err = fmt.Errorf("failed to get available balance: %w", r) available = abi.NewTokenAmount(0) } }() @@ -191,7 +192,7 @@ func (s *state9) GetSectorExpiration(num abi.SectorNumber) (*SectorExpiration, e return nil, err } if out.Early == 0 && out.OnTime == 0 { - return nil, xerrors.Errorf("failed to find sector %d", num) + return nil, fmt.Errorf("failed to find sector %d", num) } return &out, nil } diff --git a/venus-shared/actors/builtin/multisig/actor.go b/venus-shared/actors/builtin/multisig/actor.go index 0c2bad8904..fe779be592 100644 --- a/venus-shared/actors/builtin/multisig/actor.go +++ b/venus-shared/actors/builtin/multisig/actor.go @@ -9,7 +9,6 @@ import ( "github.com/minio/blake2b-simd" cbg "github.com/whyrusleeping/cbor-gen" - "golang.org/x/xerrors" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" @@ -41,7 +40,7 @@ import ( func Load(store adt.Store, act *types.Actor) (State, error) { if name, av, ok := actors.GetActorMetaByCode(act.Code); ok { if name != actors.MultisigKey { - return nil, xerrors.Errorf("actor code is not multisig: %s", name) + return nil, fmt.Errorf("actor code is not multisig: %s", name) } switch av { @@ -80,7 +79,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, signers []address.Address, threshold uint64, startEpoch abi.ChainEpoch, unlockDuration abi.ChainEpoch, initialBalance abi.TokenAmount) (State, error) { @@ -114,7 +113,7 @@ func MakeState(store adt.Store, av actorstypes.Version, signers []address.Addres return make9(store, signers, threshold, startEpoch, unlockDuration, initialBalance) } - return nil, xerrors.Errorf("unknown actor version %d", av) + return nil, fmt.Errorf("unknown actor version %d", av) } type State interface { @@ -200,13 +199,13 @@ func txnParams(id uint64, data *ProposalHashData) ([]byte, error) { params := msig9.TxnIDParams{ID: msig9.TxnID(id)} if data != nil { if data.Requester.Protocol() != address.ID { - return nil, xerrors.Errorf("proposer address must be an ID address, was %s", data.Requester) + return nil, fmt.Errorf("proposer address must be an ID address, was %s", data.Requester) } if data.Value.Sign() == -1 { - return nil, xerrors.Errorf("proposal value must be non-negative, was %s", data.Value) + return nil, fmt.Errorf("proposal value must be non-negative, was %s", data.Value) } if data.To == address.Undef { - return nil, xerrors.Errorf("proposed destination address must be set") + return nil, fmt.Errorf("proposed destination address must be set") } pser, err := data.Serialize() if err != nil { diff --git a/venus-shared/actors/builtin/multisig/actor.go.template b/venus-shared/actors/builtin/multisig/actor.go.template index 06971f2832..a73b4e55c9 100644 --- a/venus-shared/actors/builtin/multisig/actor.go.template +++ b/venus-shared/actors/builtin/multisig/actor.go.template @@ -8,7 +8,6 @@ import ( "github.com/minio/blake2b-simd" cbg "github.com/whyrusleeping/cbor-gen" - "golang.org/x/xerrors" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" @@ -31,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.MultisigKey { - return nil, xerrors.Errorf("actor code is not multisig: %s", name) + return nil, fmt.Errorf("actor code is not multisig: %s", name) } switch av { @@ -53,7 +52,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, signers []address.Address, threshold uint64, startEpoch abi.ChainEpoch, unlockDuration abi.ChainEpoch, initialBalance abi.TokenAmount) (State, error) { @@ -63,7 +62,7 @@ func MakeState(store adt.Store, av actorstypes.Version, signers []address.Addres return make{{.}}(store, signers, threshold, startEpoch, unlockDuration, initialBalance) {{end}} } - return nil, xerrors.Errorf("unknown actor version %d", av) + return nil, fmt.Errorf("unknown actor version %d", av) } type State interface { @@ -125,13 +124,13 @@ func txnParams(id uint64, data *ProposalHashData) ([]byte, error) { params := msig{{.latestVersion}}.TxnIDParams{ID: msig{{.latestVersion}}.TxnID(id)} if data != nil { if data.Requester.Protocol() != address.ID { - return nil, xerrors.Errorf("proposer address must be an ID address, was %s", data.Requester) + return nil, fmt.Errorf("proposer address must be an ID address, was %s", data.Requester) } if data.Value.Sign() == -1 { - return nil, xerrors.Errorf("proposal value must be non-negative, was %s", data.Value) + return nil, fmt.Errorf("proposal value must be non-negative, was %s", data.Value) } if data.To == address.Undef { - return nil, xerrors.Errorf("proposed destination address must be set") + return nil, fmt.Errorf("proposed destination address must be set") } pser, err := data.Serialize() if err != nil { diff --git a/venus-shared/actors/builtin/multisig/message.sep.go.template b/venus-shared/actors/builtin/multisig/message.sep.go.template index 21ea637130..c709234b01 100644 --- a/venus-shared/actors/builtin/multisig/message.sep.go.template +++ b/venus-shared/actors/builtin/multisig/message.sep.go.template @@ -3,7 +3,7 @@ package multisig import ( - "golang.org/x/xerrors" + "fmt" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" @@ -35,7 +35,7 @@ func (m message{{.v}}) Create( lenAddrs := uint64(len(signers)) if lenAddrs < threshold { - return nil, xerrors.Errorf("cannot require signing of more addresses than provided for multisig") + return nil, fmt.Errorf("cannot require signing of more addresses than provided for multisig") } if threshold == 0 { @@ -43,11 +43,11 @@ func (m message{{.v}}) Create( } if m.from == address.Undef { - return nil, xerrors.Errorf("must provide source address") + return nil, fmt.Errorf("must provide source address") } {{if (le .v 1)}} if unlockStart != 0 { - return nil, xerrors.Errorf("actors v0 does not support a non-zero vesting start time") + return nil, fmt.Errorf("actors v0 does not support a non-zero vesting start time") } {{end}} // Set up constructor parameters for multisig @@ -72,7 +72,7 @@ func (m message{{.v}}) Create( {{else}} code, ok := actors.GetActorCodeID(actorstypes.Version{{.v}}, actors.MultisigKey) if !ok { - return nil, xerrors.Errorf("failed to get multisig code ID") + return nil, fmt.Errorf("failed to get multisig code ID") } // new actors are created by invoking 'exec' on the init actor with the constructor params @@ -102,19 +102,19 @@ func (m message0) Propose(msig, to address.Address, amt abi.TokenAmount, method abi.MethodNum, params []byte) (*types.Message, error) { if msig == address.Undef { - return nil, xerrors.Errorf("must provide a multisig address for proposal") + return nil, fmt.Errorf("must provide a multisig address for proposal") } if to == address.Undef { - return nil, xerrors.Errorf("must provide a target address for proposal") + return nil, fmt.Errorf("must provide a target address for proposal") } if amt.Sign() == -1 { - return nil, xerrors.Errorf("must provide a non-negative amount for proposed send") + return nil, fmt.Errorf("must provide a non-negative amount for proposed send") } if m.from == address.Undef { - return nil, xerrors.Errorf("must provide source address") + return nil, fmt.Errorf("must provide source address") } enc, actErr := actors.SerializeParams(&multisig0.ProposeParams{ @@ -124,7 +124,7 @@ func (m message0) Propose(msig, to address.Address, amt abi.TokenAmount, Params: params, }) if actErr != nil { - return nil, xerrors.Errorf("failed to serialize parameters: %w", actErr) + return nil, fmt.Errorf("failed to serialize parameters: %w", actErr) } return &types.Message{ diff --git a/venus-shared/actors/builtin/multisig/message.v0.go b/venus-shared/actors/builtin/multisig/message.v0.go index bc35eca238..bff3932c93 100644 --- a/venus-shared/actors/builtin/multisig/message.v0.go +++ b/venus-shared/actors/builtin/multisig/message.v0.go @@ -3,7 +3,7 @@ package multisig import ( - "golang.org/x/xerrors" + "fmt" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" @@ -29,7 +29,7 @@ func (m message0) Create( lenAddrs := uint64(len(signers)) if lenAddrs < threshold { - return nil, xerrors.Errorf("cannot require signing of more addresses than provided for multisig") + return nil, fmt.Errorf("cannot require signing of more addresses than provided for multisig") } if threshold == 0 { @@ -37,11 +37,11 @@ func (m message0) Create( } if m.from == address.Undef { - return nil, xerrors.Errorf("must provide source address") + return nil, fmt.Errorf("must provide source address") } if unlockStart != 0 { - return nil, xerrors.Errorf("actors v0 does not support a non-zero vesting start time") + return nil, fmt.Errorf("actors v0 does not support a non-zero vesting start time") } // Set up constructor parameters for multisig @@ -80,19 +80,19 @@ func (m message0) Propose(msig, to address.Address, amt abi.TokenAmount, method abi.MethodNum, params []byte) (*types.Message, error) { if msig == address.Undef { - return nil, xerrors.Errorf("must provide a multisig address for proposal") + return nil, fmt.Errorf("must provide a multisig address for proposal") } if to == address.Undef { - return nil, xerrors.Errorf("must provide a target address for proposal") + return nil, fmt.Errorf("must provide a target address for proposal") } if amt.Sign() == -1 { - return nil, xerrors.Errorf("must provide a non-negative amount for proposed send") + return nil, fmt.Errorf("must provide a non-negative amount for proposed send") } if m.from == address.Undef { - return nil, xerrors.Errorf("must provide source address") + return nil, fmt.Errorf("must provide source address") } enc, actErr := actors.SerializeParams(&multisig0.ProposeParams{ @@ -102,7 +102,7 @@ func (m message0) Propose(msig, to address.Address, amt abi.TokenAmount, Params: params, }) if actErr != nil { - return nil, xerrors.Errorf("failed to serialize parameters: %w", actErr) + return nil, fmt.Errorf("failed to serialize parameters: %w", actErr) } return &types.Message{ diff --git a/venus-shared/actors/builtin/multisig/message.v2.go b/venus-shared/actors/builtin/multisig/message.v2.go index ea02287c05..0bbec6fc15 100644 --- a/venus-shared/actors/builtin/multisig/message.v2.go +++ b/venus-shared/actors/builtin/multisig/message.v2.go @@ -3,7 +3,7 @@ package multisig import ( - "golang.org/x/xerrors" + "fmt" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" @@ -29,7 +29,7 @@ func (m message2) Create( lenAddrs := uint64(len(signers)) if lenAddrs < threshold { - return nil, xerrors.Errorf("cannot require signing of more addresses than provided for multisig") + return nil, fmt.Errorf("cannot require signing of more addresses than provided for multisig") } if threshold == 0 { @@ -37,7 +37,7 @@ func (m message2) Create( } if m.from == address.Undef { - return nil, xerrors.Errorf("must provide source address") + return nil, fmt.Errorf("must provide source address") } // Set up constructor parameters for multisig diff --git a/venus-shared/actors/builtin/multisig/message.v3.go b/venus-shared/actors/builtin/multisig/message.v3.go index 4bca3d6e3d..301b7d8cdb 100644 --- a/venus-shared/actors/builtin/multisig/message.v3.go +++ b/venus-shared/actors/builtin/multisig/message.v3.go @@ -3,7 +3,7 @@ package multisig import ( - "golang.org/x/xerrors" + "fmt" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" @@ -29,7 +29,7 @@ func (m message3) Create( lenAddrs := uint64(len(signers)) if lenAddrs < threshold { - return nil, xerrors.Errorf("cannot require signing of more addresses than provided for multisig") + return nil, fmt.Errorf("cannot require signing of more addresses than provided for multisig") } if threshold == 0 { @@ -37,7 +37,7 @@ func (m message3) Create( } if m.from == address.Undef { - return nil, xerrors.Errorf("must provide source address") + return nil, fmt.Errorf("must provide source address") } // Set up constructor parameters for multisig diff --git a/venus-shared/actors/builtin/multisig/message.v4.go b/venus-shared/actors/builtin/multisig/message.v4.go index 18e0e28ae3..f63fc4c021 100644 --- a/venus-shared/actors/builtin/multisig/message.v4.go +++ b/venus-shared/actors/builtin/multisig/message.v4.go @@ -3,7 +3,7 @@ package multisig import ( - "golang.org/x/xerrors" + "fmt" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" @@ -29,7 +29,7 @@ func (m message4) Create( lenAddrs := uint64(len(signers)) if lenAddrs < threshold { - return nil, xerrors.Errorf("cannot require signing of more addresses than provided for multisig") + return nil, fmt.Errorf("cannot require signing of more addresses than provided for multisig") } if threshold == 0 { @@ -37,7 +37,7 @@ func (m message4) Create( } if m.from == address.Undef { - return nil, xerrors.Errorf("must provide source address") + return nil, fmt.Errorf("must provide source address") } // Set up constructor parameters for multisig diff --git a/venus-shared/actors/builtin/multisig/message.v5.go b/venus-shared/actors/builtin/multisig/message.v5.go index 15744a5e6f..cc5eedb3e0 100644 --- a/venus-shared/actors/builtin/multisig/message.v5.go +++ b/venus-shared/actors/builtin/multisig/message.v5.go @@ -3,7 +3,7 @@ package multisig import ( - "golang.org/x/xerrors" + "fmt" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" @@ -29,7 +29,7 @@ func (m message5) Create( lenAddrs := uint64(len(signers)) if lenAddrs < threshold { - return nil, xerrors.Errorf("cannot require signing of more addresses than provided for multisig") + return nil, fmt.Errorf("cannot require signing of more addresses than provided for multisig") } if threshold == 0 { @@ -37,7 +37,7 @@ func (m message5) Create( } if m.from == address.Undef { - return nil, xerrors.Errorf("must provide source address") + return nil, fmt.Errorf("must provide source address") } // Set up constructor parameters for multisig diff --git a/venus-shared/actors/builtin/multisig/message.v6.go b/venus-shared/actors/builtin/multisig/message.v6.go index 364df4e4fa..e98c5c0ea7 100644 --- a/venus-shared/actors/builtin/multisig/message.v6.go +++ b/venus-shared/actors/builtin/multisig/message.v6.go @@ -3,7 +3,7 @@ package multisig import ( - "golang.org/x/xerrors" + "fmt" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" @@ -29,7 +29,7 @@ func (m message6) Create( lenAddrs := uint64(len(signers)) if lenAddrs < threshold { - return nil, xerrors.Errorf("cannot require signing of more addresses than provided for multisig") + return nil, fmt.Errorf("cannot require signing of more addresses than provided for multisig") } if threshold == 0 { @@ -37,7 +37,7 @@ func (m message6) Create( } if m.from == address.Undef { - return nil, xerrors.Errorf("must provide source address") + return nil, fmt.Errorf("must provide source address") } // Set up constructor parameters for multisig diff --git a/venus-shared/actors/builtin/multisig/message.v7.go b/venus-shared/actors/builtin/multisig/message.v7.go index e86709de4e..749b54c0b1 100644 --- a/venus-shared/actors/builtin/multisig/message.v7.go +++ b/venus-shared/actors/builtin/multisig/message.v7.go @@ -3,7 +3,7 @@ package multisig import ( - "golang.org/x/xerrors" + "fmt" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" @@ -29,7 +29,7 @@ func (m message7) Create( lenAddrs := uint64(len(signers)) if lenAddrs < threshold { - return nil, xerrors.Errorf("cannot require signing of more addresses than provided for multisig") + return nil, fmt.Errorf("cannot require signing of more addresses than provided for multisig") } if threshold == 0 { @@ -37,7 +37,7 @@ func (m message7) Create( } if m.from == address.Undef { - return nil, xerrors.Errorf("must provide source address") + return nil, fmt.Errorf("must provide source address") } // Set up constructor parameters for multisig diff --git a/venus-shared/actors/builtin/multisig/message.v8.go b/venus-shared/actors/builtin/multisig/message.v8.go index 79e41fcb91..659447be9f 100644 --- a/venus-shared/actors/builtin/multisig/message.v8.go +++ b/venus-shared/actors/builtin/multisig/message.v8.go @@ -3,7 +3,7 @@ package multisig import ( - "golang.org/x/xerrors" + "fmt" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" @@ -29,7 +29,7 @@ func (m message8) Create( lenAddrs := uint64(len(signers)) if lenAddrs < threshold { - return nil, xerrors.Errorf("cannot require signing of more addresses than provided for multisig") + return nil, fmt.Errorf("cannot require signing of more addresses than provided for multisig") } if threshold == 0 { @@ -37,7 +37,7 @@ func (m message8) Create( } if m.from == address.Undef { - return nil, xerrors.Errorf("must provide source address") + return nil, fmt.Errorf("must provide source address") } // Set up constructor parameters for multisig @@ -55,7 +55,7 @@ func (m message8) Create( code, ok := actors.GetActorCodeID(actorstypes.Version8, actors.MultisigKey) if !ok { - return nil, xerrors.Errorf("failed to get multisig code ID") + return nil, fmt.Errorf("failed to get multisig code ID") } // new actors are created by invoking 'exec' on the init actor with the constructor params diff --git a/venus-shared/actors/builtin/multisig/message.v9.go b/venus-shared/actors/builtin/multisig/message.v9.go index 6d031705de..35e8873998 100644 --- a/venus-shared/actors/builtin/multisig/message.v9.go +++ b/venus-shared/actors/builtin/multisig/message.v9.go @@ -3,7 +3,7 @@ package multisig import ( - "golang.org/x/xerrors" + "fmt" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" @@ -29,7 +29,7 @@ func (m message9) Create( lenAddrs := uint64(len(signers)) if lenAddrs < threshold { - return nil, xerrors.Errorf("cannot require signing of more addresses than provided for multisig") + return nil, fmt.Errorf("cannot require signing of more addresses than provided for multisig") } if threshold == 0 { @@ -37,7 +37,7 @@ func (m message9) Create( } if m.from == address.Undef { - return nil, xerrors.Errorf("must provide source address") + return nil, fmt.Errorf("must provide source address") } // Set up constructor parameters for multisig @@ -55,7 +55,7 @@ func (m message9) Create( code, ok := actors.GetActorCodeID(actorstypes.Version9, actors.MultisigKey) if !ok { - return nil, xerrors.Errorf("failed to get multisig code ID") + return nil, fmt.Errorf("failed to get multisig code ID") } // new actors are created by invoking 'exec' on the init actor with the constructor params diff --git a/venus-shared/actors/builtin/multisig/state.sep.go.template b/venus-shared/actors/builtin/multisig/state.sep.go.template index 56d46c629f..bdd7b86c6f 100644 --- a/venus-shared/actors/builtin/multisig/state.sep.go.template +++ b/venus-shared/actors/builtin/multisig/state.sep.go.template @@ -11,7 +11,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" @@ -103,7 +103,7 @@ func (s *state{{.v}}) ForEachPendingTxn(cb func(id int64, txn Transaction) error return arr.ForEach(&out, func(key string) error { txid, n := binary.Varint([]byte(key)) if n <= 0 { - return xerrors.Errorf("invalid pending transaction key: %v", key) + return fmt.Errorf("invalid pending transaction key: %v", key) } return cb(txid, (Transaction)(out)) //nolint:unconvert }) diff --git a/venus-shared/actors/builtin/multisig/state.v0.go b/venus-shared/actors/builtin/multisig/state.v0.go index 2a57b89145..f522309bbb 100644 --- a/venus-shared/actors/builtin/multisig/state.v0.go +++ b/venus-shared/actors/builtin/multisig/state.v0.go @@ -6,11 +6,12 @@ import ( "bytes" "encoding/binary" + "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" @@ -86,7 +87,7 @@ func (s *state0) ForEachPendingTxn(cb func(id int64, txn Transaction) error) err return arr.ForEach(&out, func(key string) error { txid, n := binary.Varint([]byte(key)) if n <= 0 { - return xerrors.Errorf("invalid pending transaction key: %v", key) + return fmt.Errorf("invalid pending transaction key: %v", key) } return cb(txid, (Transaction)(out)) //nolint:unconvert }) diff --git a/venus-shared/actors/builtin/multisig/state.v2.go b/venus-shared/actors/builtin/multisig/state.v2.go index ef663756cd..8711f5c12e 100644 --- a/venus-shared/actors/builtin/multisig/state.v2.go +++ b/venus-shared/actors/builtin/multisig/state.v2.go @@ -6,11 +6,12 @@ import ( "bytes" "encoding/binary" + "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" @@ -86,7 +87,7 @@ func (s *state2) ForEachPendingTxn(cb func(id int64, txn Transaction) error) err return arr.ForEach(&out, func(key string) error { txid, n := binary.Varint([]byte(key)) if n <= 0 { - return xerrors.Errorf("invalid pending transaction key: %v", key) + return fmt.Errorf("invalid pending transaction key: %v", key) } return cb(txid, (Transaction)(out)) //nolint:unconvert }) diff --git a/venus-shared/actors/builtin/multisig/state.v3.go b/venus-shared/actors/builtin/multisig/state.v3.go index 720f4a5eff..7d268a79f4 100644 --- a/venus-shared/actors/builtin/multisig/state.v3.go +++ b/venus-shared/actors/builtin/multisig/state.v3.go @@ -6,11 +6,12 @@ import ( "bytes" "encoding/binary" + "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,7 +89,7 @@ func (s *state3) ForEachPendingTxn(cb func(id int64, txn Transaction) error) err return arr.ForEach(&out, func(key string) error { txid, n := binary.Varint([]byte(key)) if n <= 0 { - return xerrors.Errorf("invalid pending transaction key: %v", key) + return fmt.Errorf("invalid pending transaction key: %v", key) } return cb(txid, (Transaction)(out)) //nolint:unconvert }) diff --git a/venus-shared/actors/builtin/multisig/state.v4.go b/venus-shared/actors/builtin/multisig/state.v4.go index a25e8ae059..ca68431738 100644 --- a/venus-shared/actors/builtin/multisig/state.v4.go +++ b/venus-shared/actors/builtin/multisig/state.v4.go @@ -6,11 +6,12 @@ import ( "bytes" "encoding/binary" + "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,7 +89,7 @@ func (s *state4) ForEachPendingTxn(cb func(id int64, txn Transaction) error) err return arr.ForEach(&out, func(key string) error { txid, n := binary.Varint([]byte(key)) if n <= 0 { - return xerrors.Errorf("invalid pending transaction key: %v", key) + return fmt.Errorf("invalid pending transaction key: %v", key) } return cb(txid, (Transaction)(out)) //nolint:unconvert }) diff --git a/venus-shared/actors/builtin/multisig/state.v5.go b/venus-shared/actors/builtin/multisig/state.v5.go index 67cd348fa8..da2ca284ce 100644 --- a/venus-shared/actors/builtin/multisig/state.v5.go +++ b/venus-shared/actors/builtin/multisig/state.v5.go @@ -6,11 +6,12 @@ import ( "bytes" "encoding/binary" + "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,7 +89,7 @@ func (s *state5) ForEachPendingTxn(cb func(id int64, txn Transaction) error) err return arr.ForEach(&out, func(key string) error { txid, n := binary.Varint([]byte(key)) if n <= 0 { - return xerrors.Errorf("invalid pending transaction key: %v", key) + return fmt.Errorf("invalid pending transaction key: %v", key) } return cb(txid, (Transaction)(out)) //nolint:unconvert }) diff --git a/venus-shared/actors/builtin/multisig/state.v6.go b/venus-shared/actors/builtin/multisig/state.v6.go index 6ee2c78b6b..e6e29fc4d0 100644 --- a/venus-shared/actors/builtin/multisig/state.v6.go +++ b/venus-shared/actors/builtin/multisig/state.v6.go @@ -6,11 +6,12 @@ import ( "bytes" "encoding/binary" + "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,7 +89,7 @@ func (s *state6) ForEachPendingTxn(cb func(id int64, txn Transaction) error) err return arr.ForEach(&out, func(key string) error { txid, n := binary.Varint([]byte(key)) if n <= 0 { - return xerrors.Errorf("invalid pending transaction key: %v", key) + return fmt.Errorf("invalid pending transaction key: %v", key) } return cb(txid, (Transaction)(out)) //nolint:unconvert }) diff --git a/venus-shared/actors/builtin/multisig/state.v7.go b/venus-shared/actors/builtin/multisig/state.v7.go index c7a2318c03..c190bcc159 100644 --- a/venus-shared/actors/builtin/multisig/state.v7.go +++ b/venus-shared/actors/builtin/multisig/state.v7.go @@ -6,11 +6,12 @@ import ( "bytes" "encoding/binary" + "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,7 +89,7 @@ func (s *state7) ForEachPendingTxn(cb func(id int64, txn Transaction) error) err return arr.ForEach(&out, func(key string) error { txid, n := binary.Varint([]byte(key)) if n <= 0 { - return xerrors.Errorf("invalid pending transaction key: %v", key) + return fmt.Errorf("invalid pending transaction key: %v", key) } return cb(txid, (Transaction)(out)) //nolint:unconvert }) diff --git a/venus-shared/actors/builtin/multisig/state.v8.go b/venus-shared/actors/builtin/multisig/state.v8.go index c89c5f643b..2718a22521 100644 --- a/venus-shared/actors/builtin/multisig/state.v8.go +++ b/venus-shared/actors/builtin/multisig/state.v8.go @@ -6,11 +6,12 @@ import ( "bytes" "encoding/binary" + "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" @@ -87,7 +88,7 @@ func (s *state8) ForEachPendingTxn(cb func(id int64, txn Transaction) error) err return arr.ForEach(&out, func(key string) error { txid, n := binary.Varint([]byte(key)) if n <= 0 { - return xerrors.Errorf("invalid pending transaction key: %v", key) + return fmt.Errorf("invalid pending transaction key: %v", key) } return cb(txid, (Transaction)(out)) //nolint:unconvert }) diff --git a/venus-shared/actors/builtin/multisig/state.v9.go b/venus-shared/actors/builtin/multisig/state.v9.go index ef5a19f3d0..38ddcd4372 100644 --- a/venus-shared/actors/builtin/multisig/state.v9.go +++ b/venus-shared/actors/builtin/multisig/state.v9.go @@ -6,11 +6,12 @@ import ( "bytes" "encoding/binary" + "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" @@ -87,7 +88,7 @@ func (s *state9) ForEachPendingTxn(cb func(id int64, txn Transaction) error) err return arr.ForEach(&out, func(key string) error { txid, n := binary.Varint([]byte(key)) if n <= 0 { - return xerrors.Errorf("invalid pending transaction key: %v", key) + return fmt.Errorf("invalid pending transaction key: %v", key) } return cb(txid, (Transaction)(out)) //nolint:unconvert }) diff --git a/venus-shared/actors/builtin/paych/actor.go b/venus-shared/actors/builtin/paych/actor.go index 3cc0c0de2c..ba2e16ae80 100644 --- a/venus-shared/actors/builtin/paych/actor.go +++ b/venus-shared/actors/builtin/paych/actor.go @@ -8,8 +8,6 @@ import ( actorstypes "github.com/filecoin-project/go-state-types/actors" - "golang.org/x/xerrors" - "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" @@ -42,7 +40,7 @@ import ( func Load(store adt.Store, act *types.Actor) (State, error) { if name, av, ok := actors.GetActorMetaByCode(act.Code); ok { if name != actors.PaychKey { - return nil, xerrors.Errorf("actor code is not paych: %s", name) + return nil, fmt.Errorf("actor code is not paych: %s", name) } switch av { @@ -81,7 +79,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) } // State is an abstract version of payment channel state that works across diff --git a/venus-shared/actors/builtin/paych/actor.go.template b/venus-shared/actors/builtin/paych/actor.go.template index 0c8607e885..8d9e98b308 100644 --- a/venus-shared/actors/builtin/paych/actor.go.template +++ b/venus-shared/actors/builtin/paych/actor.go.template @@ -7,7 +7,6 @@ import ( "encoding/base64" "fmt" - "golang.org/x/xerrors" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" @@ -32,7 +31,7 @@ import ( func Load(store adt.Store, act *types.Actor) (State, error) { if name, av, ok := actors.GetActorMetaByCode(act.Code); ok { if name != actors.PaychKey { - return nil, xerrors.Errorf("actor code is not paych: %s", name) + return nil, fmt.Errorf("actor code is not paych: %s", name) } switch av { @@ -54,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) } // State is an abstract version of payment channel state that works across diff --git a/venus-shared/actors/builtin/paych/message.sep.go.template b/venus-shared/actors/builtin/paych/message.sep.go.template index 752c8aaf2b..62ac6108ff 100644 --- a/venus-shared/actors/builtin/paych/message.sep.go.template +++ b/venus-shared/actors/builtin/paych/message.sep.go.template @@ -4,7 +4,7 @@ package paych import ( {{if (ge .v 8)}} - "golang.org/x/xerrors" + "fmt" {{end}} "github.com/filecoin-project/go-address" @@ -36,7 +36,7 @@ func (m message{{.v}}) Create(to address.Address, initialAmount abi.TokenAmount) {{else}} actorCodeID, ok := actors.GetActorCodeID(actorstypes.Version{{.v}}, "paymentchannel") if !ok { - return nil, xerrors.Errorf("error getting actor paymentchannel code id for actor version %d", {{.v}}) + return nil, fmt.Errorf("error getting actor paymentchannel code id for actor version %d", {{.v}}) } {{end}} diff --git a/venus-shared/actors/builtin/paych/message.v8.go b/venus-shared/actors/builtin/paych/message.v8.go index a27a8aa067..146c989c24 100644 --- a/venus-shared/actors/builtin/paych/message.v8.go +++ b/venus-shared/actors/builtin/paych/message.v8.go @@ -3,7 +3,7 @@ package paych import ( - "golang.org/x/xerrors" + "fmt" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" @@ -26,7 +26,7 @@ func (m message8) Create(to address.Address, initialAmount abi.TokenAmount) (*ty actorCodeID, ok := actors.GetActorCodeID(actorstypes.Version8, "paymentchannel") if !ok { - return nil, xerrors.Errorf("error getting actor paymentchannel code id for actor version %d", 8) + return nil, fmt.Errorf("error getting actor paymentchannel code id for actor version %d", 8) } params, aerr := actors.SerializeParams(&paych8.ConstructorParams{From: m.from, To: to}) diff --git a/venus-shared/actors/builtin/paych/message.v9.go b/venus-shared/actors/builtin/paych/message.v9.go index f681cb8d54..a588ea34c8 100644 --- a/venus-shared/actors/builtin/paych/message.v9.go +++ b/venus-shared/actors/builtin/paych/message.v9.go @@ -3,7 +3,7 @@ package paych import ( - "golang.org/x/xerrors" + "fmt" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" @@ -26,7 +26,7 @@ func (m message9) Create(to address.Address, initialAmount abi.TokenAmount) (*ty actorCodeID, ok := actors.GetActorCodeID(actorstypes.Version9, "paymentchannel") if !ok { - return nil, xerrors.Errorf("error getting actor paymentchannel code id for actor version %d", 9) + return nil, fmt.Errorf("error getting actor paymentchannel code id for actor version %d", 9) } params, aerr := actors.SerializeParams(&paych9.ConstructorParams{From: m.from, To: to}) diff --git a/venus-shared/actors/builtin/power/actor.go b/venus-shared/actors/builtin/power/actor.go index 40e49f86eb..6608884d59 100644 --- a/venus-shared/actors/builtin/power/actor.go +++ b/venus-shared/actors/builtin/power/actor.go @@ -3,12 +3,13 @@ package power import ( + "fmt" + "github.com/filecoin-project/go-address" actorstypes "github.com/filecoin-project/go-state-types/actors" "github.com/filecoin-project/go-state-types/big" "github.com/filecoin-project/venus/venus-shared/actors" cbg "github.com/whyrusleeping/cbor-gen" - "golang.org/x/xerrors" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/cbor" @@ -42,7 +43,7 @@ var ( func Load(store adt.Store, act *types.Actor) (State, error) { if name, av, ok := actors.GetActorMetaByCode(act.Code); ok { if name != actors.PowerKey { - return nil, xerrors.Errorf("actor code is not power: %s", name) + return nil, fmt.Errorf("actor code is not power: %s", name) } switch av { @@ -81,7 +82,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) { @@ -115,7 +116,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) } type State interface { diff --git a/venus-shared/actors/builtin/power/actor.go.template b/venus-shared/actors/builtin/power/actor.go.template index 398682beda..6cbbe997ab 100644 --- a/venus-shared/actors/builtin/power/actor.go.template +++ b/venus-shared/actors/builtin/power/actor.go.template @@ -8,7 +8,7 @@ import ( "github.com/filecoin-project/go-state-types/big" "github.com/filecoin-project/venus/venus-shared/actors" cbg "github.com/whyrusleeping/cbor-gen" - "golang.org/x/xerrors" + "fmt" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/cbor" @@ -33,7 +33,7 @@ var ( func Load(store adt.Store, act *types.Actor) (State, error) { if name, av, ok := actors.GetActorMetaByCode(act.Code); ok { if name != actors.PowerKey { - return nil, xerrors.Errorf("actor code is not power: %s", name) + return nil, fmt.Errorf("actor code is not power: %s", name) } switch av { @@ -55,7 +55,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) { @@ -65,7 +65,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) } type State interface { diff --git a/venus-shared/actors/builtin/reward/actor.go b/venus-shared/actors/builtin/reward/actor.go index 9ec0d3bd06..358c5dbe1a 100644 --- a/venus-shared/actors/builtin/reward/actor.go +++ b/venus-shared/actors/builtin/reward/actor.go @@ -3,11 +3,12 @@ package reward import ( + "fmt" + "github.com/filecoin-project/go-state-types/abi" actorstypes "github.com/filecoin-project/go-state-types/actors" reward0 "github.com/filecoin-project/specs-actors/actors/builtin/reward" "github.com/filecoin-project/venus/venus-shared/actors" - "golang.org/x/xerrors" "github.com/filecoin-project/go-state-types/cbor" @@ -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.RewardKey { - return nil, xerrors.Errorf("actor code is not reward: %s", name) + return nil, fmt.Errorf("actor code is not reward: %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, currRealizedPower abi.StoragePower) (State, error) { @@ -113,7 +114,7 @@ func MakeState(store adt.Store, av actorstypes.Version, currRealizedPower abi.St return make9(store, currRealizedPower) } - 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/reward/actor.go.template b/venus-shared/actors/builtin/reward/actor.go.template index 426d7cc763..62c639d51d 100644 --- a/venus-shared/actors/builtin/reward/actor.go.template +++ b/venus-shared/actors/builtin/reward/actor.go.template @@ -7,7 +7,7 @@ import ( "github.com/filecoin-project/go-state-types/abi" reward0 "github.com/filecoin-project/specs-actors/actors/builtin/reward" "github.com/filecoin-project/venus/venus-shared/actors" - "golang.org/x/xerrors" + "fmt" "github.com/filecoin-project/go-state-types/cbor" {{range .versions}} @@ -30,7 +30,7 @@ var ( func Load(store adt.Store, act *types.Actor) (State, error) { if name, av, ok := actors.GetActorMetaByCode(act.Code); ok { if name != actors.RewardKey { - return nil, xerrors.Errorf("actor code is not reward: %s", name) + return nil, fmt.Errorf("actor code is not reward: %s", name) } switch av { @@ -52,7 +52,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, currRealizedPower abi.StoragePower) (State, error) { @@ -62,7 +62,7 @@ func MakeState(store adt.Store, av actorstypes.Version, currRealizedPower abi.St return make{{.}}(store, currRealizedPower) {{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/system/actor.go b/venus-shared/actors/builtin/system/actor.go index 91336011b8..9c2b8c7ccb 100644 --- a/venus-shared/actors/builtin/system/actor.go +++ b/venus-shared/actors/builtin/system/actor.go @@ -9,7 +9,7 @@ import ( types "github.com/filecoin-project/venus/venus-shared/internal" "github.com/ipfs/go-cid" - "golang.org/x/xerrors" + "fmt" builtin0 "github.com/filecoin-project/specs-actors/actors/builtin" @@ -35,7 +35,7 @@ var ( func Load(store adt.Store, act *types.Actor) (State, error) { if name, av, ok := actors.GetActorMetaByCode(act.Code); ok { if name != actors.SystemKey { - return nil, xerrors.Errorf("actor code is not system: %s", name) + return nil, fmt.Errorf("actor code is not system: %s", name) } switch av { @@ -74,7 +74,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, builtinActors cid.Cid) (State, error) { @@ -108,7 +108,7 @@ func MakeState(store adt.Store, av actorstypes.Version, builtinActors cid.Cid) ( return make9(store, builtinActors) } - 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/system/actor.go.template b/venus-shared/actors/builtin/system/actor.go.template index f6804bf0d7..d9c0675058 100644 --- a/venus-shared/actors/builtin/system/actor.go.template +++ b/venus-shared/actors/builtin/system/actor.go.template @@ -9,7 +9,7 @@ import ( types "github.com/filecoin-project/venus/venus-shared/internal" "github.com/ipfs/go-cid" - "golang.org/x/xerrors" + "fmt" {{range .versions}} {{if (le . 7)}} @@ -26,7 +26,7 @@ var ( func Load(store adt.Store, act *types.Actor) (State, error) { if name, av, ok := actors.GetActorMetaByCode(act.Code); ok { if name != actors.SystemKey { - return nil, xerrors.Errorf("actor code is not system: %s", name) + return nil, fmt.Errorf("actor code is not system: %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, builtinActors cid.Cid) (State, error) { @@ -58,7 +58,7 @@ func MakeState(store adt.Store, av actorstypes.Version, builtinActors cid.Cid) ( return make{{.}}(store{{if (ge . 8)}}, builtinActors{{end}}) {{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/system/state.sep.go.template b/venus-shared/actors/builtin/system/state.sep.go.template index 9aa213039d..72e82666c0 100644 --- a/venus-shared/actors/builtin/system/state.sep.go.template +++ b/venus-shared/actors/builtin/system/state.sep.go.template @@ -9,7 +9,7 @@ import ( {{if (le .v 7)}} system{{.v}} "github.com/filecoin-project/specs-actors{{.import}}actors/builtin/system" - "golang.org/x/xerrors" + "fmt" {{else}} system{{.v}} "github.com/filecoin-project/go-state-types/builtin{{.import}}system" {{end}} diff --git a/venus-shared/actors/builtin/system/state.v0.go b/venus-shared/actors/builtin/system/state.v0.go index fb0b12467d..ff6dc110bc 100644 --- a/venus-shared/actors/builtin/system/state.v0.go +++ b/venus-shared/actors/builtin/system/state.v0.go @@ -4,11 +4,11 @@ package system import ( "github.com/ipfs/go-cid" + "golang.org/x/xerrors" "github.com/filecoin-project/venus/venus-shared/actors/adt" system0 "github.com/filecoin-project/specs-actors/actors/builtin/system" - "golang.org/x/xerrors" ) var _ State = (*state0)(nil) diff --git a/venus-shared/actors/builtin/system/state.v2.go b/venus-shared/actors/builtin/system/state.v2.go index 96a995fa68..376195b254 100644 --- a/venus-shared/actors/builtin/system/state.v2.go +++ b/venus-shared/actors/builtin/system/state.v2.go @@ -4,11 +4,11 @@ package system import ( "github.com/ipfs/go-cid" + "golang.org/x/xerrors" "github.com/filecoin-project/venus/venus-shared/actors/adt" system2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/system" - "golang.org/x/xerrors" ) var _ State = (*state2)(nil) diff --git a/venus-shared/actors/builtin/system/state.v3.go b/venus-shared/actors/builtin/system/state.v3.go index 6bbca3f7da..eeb00d03cb 100644 --- a/venus-shared/actors/builtin/system/state.v3.go +++ b/venus-shared/actors/builtin/system/state.v3.go @@ -4,11 +4,11 @@ package system import ( "github.com/ipfs/go-cid" + "golang.org/x/xerrors" "github.com/filecoin-project/venus/venus-shared/actors/adt" system3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/system" - "golang.org/x/xerrors" ) var _ State = (*state3)(nil) diff --git a/venus-shared/actors/builtin/system/state.v4.go b/venus-shared/actors/builtin/system/state.v4.go index 6c9e501754..7498d996a1 100644 --- a/venus-shared/actors/builtin/system/state.v4.go +++ b/venus-shared/actors/builtin/system/state.v4.go @@ -4,11 +4,11 @@ package system import ( "github.com/ipfs/go-cid" + "golang.org/x/xerrors" "github.com/filecoin-project/venus/venus-shared/actors/adt" system4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/system" - "golang.org/x/xerrors" ) var _ State = (*state4)(nil) diff --git a/venus-shared/actors/builtin/system/state.v5.go b/venus-shared/actors/builtin/system/state.v5.go index 0b862c16be..fcf197bf1a 100644 --- a/venus-shared/actors/builtin/system/state.v5.go +++ b/venus-shared/actors/builtin/system/state.v5.go @@ -4,11 +4,11 @@ package system import ( "github.com/ipfs/go-cid" + "golang.org/x/xerrors" "github.com/filecoin-project/venus/venus-shared/actors/adt" system5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/system" - "golang.org/x/xerrors" ) var _ State = (*state5)(nil) diff --git a/venus-shared/actors/builtin/system/state.v6.go b/venus-shared/actors/builtin/system/state.v6.go index 8f783219d2..dc1e1ca1fc 100644 --- a/venus-shared/actors/builtin/system/state.v6.go +++ b/venus-shared/actors/builtin/system/state.v6.go @@ -4,11 +4,11 @@ package system import ( "github.com/ipfs/go-cid" + "golang.org/x/xerrors" "github.com/filecoin-project/venus/venus-shared/actors/adt" system6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/system" - "golang.org/x/xerrors" ) var _ State = (*state6)(nil) diff --git a/venus-shared/actors/builtin/system/state.v7.go b/venus-shared/actors/builtin/system/state.v7.go index 45c6cd33c7..c56156d1a7 100644 --- a/venus-shared/actors/builtin/system/state.v7.go +++ b/venus-shared/actors/builtin/system/state.v7.go @@ -4,11 +4,11 @@ package system import ( "github.com/ipfs/go-cid" + "golang.org/x/xerrors" "github.com/filecoin-project/venus/venus-shared/actors/adt" system7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/system" - "golang.org/x/xerrors" ) var _ State = (*state7)(nil) diff --git a/venus-shared/actors/builtin/verifreg/actor.go b/venus-shared/actors/builtin/verifreg/actor.go index b1f9678e40..8da58d8693 100644 --- a/venus-shared/actors/builtin/verifreg/actor.go +++ b/venus-shared/actors/builtin/verifreg/actor.go @@ -3,8 +3,9 @@ package verifreg import ( + "fmt" + actorstypes "github.com/filecoin-project/go-state-types/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.VerifregKey { - return nil, xerrors.Errorf("actor code is not verifreg: %s", name) + return nil, fmt.Errorf("actor code is not verifreg: %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, rootKeyAddress address.Address) (State, error) { @@ -113,7 +114,7 @@ func MakeState(store adt.Store, av actorstypes.Version, rootKeyAddress address.A return make9(store, rootKeyAddress) } - 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/verifreg/actor.go.template b/venus-shared/actors/builtin/verifreg/actor.go.template index 4a29beb7f7..fee636c120 100644 --- a/venus-shared/actors/builtin/verifreg/actor.go.template +++ b/venus-shared/actors/builtin/verifreg/actor.go.template @@ -4,7 +4,7 @@ package verifreg import ( actorstypes "github.com/filecoin-project/go-state-types/actors" - "golang.org/x/xerrors" + "fmt" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" @@ -30,7 +30,7 @@ var ( func Load(store adt.Store, act *types.Actor) (State, error) { if name, av, ok := actors.GetActorMetaByCode(act.Code); ok { if name != actors.VerifregKey { - return nil, xerrors.Errorf("actor code is not verifreg: %s", name) + return nil, fmt.Errorf("actor code is not verifreg: %s", name) } switch av { @@ -52,7 +52,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, rootKeyAddress address.Address) (State, error) { @@ -62,7 +62,7 @@ func MakeState(store adt.Store, av actorstypes.Version, rootKeyAddress address.A return make{{.}}(store, rootKeyAddress) {{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/policy/policy.go b/venus-shared/actors/policy/policy.go index c64588ca28..940dd4069a 100644 --- a/venus-shared/actors/policy/policy.go +++ b/venus-shared/actors/policy/policy.go @@ -5,8 +5,9 @@ package policy import ( actorstypes "github.com/filecoin-project/go-state-types/actors" + "fmt" + "github.com/filecoin-project/go-state-types/big" - "golang.org/x/xerrors" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/network" @@ -291,7 +292,7 @@ func GetMaxProveCommitDuration(ver actorstypes.Version, t abi.RegisteredSealProo return miner9.MaxProveCommitDuration[t], nil default: - return 0, xerrors.Errorf("unsupported actors version") + return 0, fmt.Errorf("unsupported actors version") } } @@ -399,7 +400,7 @@ func DealProviderCollateralBounds( return min, max, nil default: - return big.Zero(), big.Zero(), xerrors.Errorf("unsupported actors version") + return big.Zero(), big.Zero(), fmt.Errorf("unsupported actors version") } } @@ -544,7 +545,7 @@ func GetAddressedSectorsMax(nwVer network.Version) (int, error) { return miner9.AddressedSectorsMax, nil default: - return 0, xerrors.Errorf("unsupported network version") + return 0, fmt.Errorf("unsupported network version") } } @@ -593,7 +594,7 @@ func GetDeclarationsMax(nwVer network.Version) (int, error) { return miner9.DeclarationsMax, nil default: - return 0, xerrors.Errorf("unsupported network version") + return 0, fmt.Errorf("unsupported network version") } } @@ -641,7 +642,7 @@ func AggregateProveCommitNetworkFee(nwVer network.Version, aggregateSize int, ba return miner9.AggregateProveCommitNetworkFee(aggregateSize, baseFee), nil default: - return big.Zero(), xerrors.Errorf("unsupported network version") + return big.Zero(), fmt.Errorf("unsupported network version") } } @@ -689,6 +690,6 @@ func AggregatePreCommitNetworkFee(nwVer network.Version, aggregateSize int, base return miner9.AggregatePreCommitNetworkFee(aggregateSize, baseFee), nil default: - return big.Zero(), xerrors.Errorf("unsupported network version") + return big.Zero(), fmt.Errorf("unsupported network version") } } diff --git a/venus-shared/actors/policy/policy.go.template b/venus-shared/actors/policy/policy.go.template index 1eb19be7bf..47d5498d74 100644 --- a/venus-shared/actors/policy/policy.go.template +++ b/venus-shared/actors/policy/policy.go.template @@ -6,7 +6,7 @@ import ( actorstypes "github.com/filecoin-project/go-state-types/actors" "github.com/filecoin-project/go-state-types/big" - "golang.org/x/xerrors" + "fmt" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/network" @@ -151,7 +151,7 @@ func GetMaxProveCommitDuration(ver actorstypes.Version, t abi.RegisteredSealProo {{end}} {{end}} default: - return 0, xerrors.Errorf("unsupported actors version") + return 0, fmt.Errorf("unsupported actors version") } } @@ -190,7 +190,7 @@ func DealProviderCollateralBounds( {{end}} {{end}} default: - return big.Zero(), big.Zero(), xerrors.Errorf("unsupported actors version") + return big.Zero(), big.Zero(), fmt.Errorf("unsupported actors version") } } @@ -264,7 +264,7 @@ func GetAddressedSectorsMax(nwVer network.Version) (int, error) { return miner{{.}}.AddressedSectorsMax, nil {{end}} default: - return 0, xerrors.Errorf("unsupported network version") + return 0, fmt.Errorf("unsupported network version") } } @@ -284,7 +284,7 @@ func GetDeclarationsMax(nwVer network.Version) (int, error) { {{end}} {{end}} default: - return 0, xerrors.Errorf("unsupported network version") + return 0, fmt.Errorf("unsupported network version") } } @@ -305,7 +305,7 @@ func AggregateProveCommitNetworkFee(nwVer network.Version, aggregateSize int, ba {{end}} {{end}} default: - return big.Zero(), xerrors.Errorf("unsupported network version") + return big.Zero(), fmt.Errorf("unsupported network version") } } @@ -324,6 +324,6 @@ func AggregatePreCommitNetworkFee(nwVer network.Version, aggregateSize int, base {{end}} {{end}} default: - return big.Zero(), xerrors.Errorf("unsupported network version") + return big.Zero(), fmt.Errorf("unsupported network version") } }