deps: update to lotus@v1.15.2

chain/actors/adt/adt.go

@@ -3,14 +3,15 @@ package adt
 import (
 	"bytes"
 	"crypto/sha256"
+	"fmt"
+
 	builtin3 "github.com/filecoin-project/specs-actors/v3/actors/builtin"
 	builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin"
 	builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin"
 	builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin"
 	builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin"
 	"github.com/ipfs/go-cid"
 	sha256simd "github.com/minio/sha256-simd"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/filecoin-project/go-state-types/cbor"
@@ -116,7 +117,7 @@ func MapOptsForActorCode(c cid.Cid) (*MapOpts, error) {
 		}, nil
 	}
 
-	return nil, xerrors.Errorf("actor code unknown or doesn't have Map: %s", c)
+	return nil, fmt.Errorf("actor code unknown or doesn't have Map: %s", c)
 }
 
 type MapHashFunc func([]byte) []byte

chain/actors/aerrors/error_test.go

@@ -1,19 +1,21 @@
 package aerrors_test
 
 import (
+	"fmt"
 	"testing"
 
 	"github.com/filecoin-project/go-state-types/exitcode"
+	"golang.org/x/xerrors"
+
 	. "github.com/filecoin-project/lily/chain/actors/aerrors"
 
 	"github.com/stretchr/testify/assert"
-	"golang.org/x/xerrors"
 )
 
 func TestFatalError(t *testing.T) {
 	e1 := xerrors.New("out of disk space")
-	e2 := xerrors.Errorf("could not put node: %w", e1)
-	e3 := xerrors.Errorf("could not save head: %w", e2)
+	e2 := fmt.Errorf("could not put node: %w", e1)
+	e3 := fmt.Errorf("could not save head: %w", e2)
 	ae := Escalate(e3, "failed to save the head")
 	aw1 := Wrap(ae, "saving head of new miner actor")
 	aw2 := Absorb(aw1, 1, "try to absorb fatal error")
@@ -25,7 +27,7 @@ func TestFatalError(t *testing.T) {
 }
 func TestAbsorbeError(t *testing.T) {
 	e1 := xerrors.New("EOF")
-	e2 := xerrors.Errorf("could not decode: %w", e1)
+	e2 := fmt.Errorf("could not decode: %w", e1)
 	ae := Absorb(e2, 35, "failed to decode CBOR")
 	aw1 := Wrap(ae, "saving head of new miner actor")
 	aw2 := Wrap(aw1, "initializing actor")

chain/actors/aerrors/wrap.go

@@ -182,7 +182,7 @@ func HandleExternalError(err error, msg string) ActorError {
 		}
 	}
 
-	if xerrors.Is(err, &cbor.SerializationError{}) {
+	if errors.Is(err, &cbor.SerializationError{}) {
 		return &actorError{
 			fatal:   false,
 			retCode: 253,

chain/actors/agen/generator/gen.go

@@ -7,8 +7,6 @@ import (
 	"os"
 	"path/filepath"
 	"text/template"
-
-	"golang.org/x/xerrors"
 )
 
 var latestVersion = 7
@@ -69,7 +67,7 @@ func generateAdapters() error {
 		{
 			af, err := ioutil.ReadFile(filepath.Join(actDir, "actor.go.template"))
 			if err != nil {
-				return xerrors.Errorf("loading actor template: %w", err)
+				return fmt.Errorf("loading actor template: %w", err)
 			}
 
 			tpl := template.Must(template.New("").Funcs(template.FuncMap{
@@ -102,7 +100,7 @@ func generateState(actDir string) error {
 			return nil // skip
 		}
 
-		return xerrors.Errorf("loading state adapter template: %w", err)
+		return fmt.Errorf("loading state adapter template: %w", err)
 	}
 
 	for _, version := range versions {
@@ -134,7 +132,7 @@ func generateMessages(actDir string) error {
 			return nil // skip
 		}
 
-		return xerrors.Errorf("loading message adapter template: %w", err)
+		return fmt.Errorf("loading message adapter template: %w", err)
 	}
 
 	for _, version := range versions {
@@ -166,7 +164,7 @@ func generatePolicy() error {
 			return nil // skip
 		}
 
-		return xerrors.Errorf("loading policy template file: %w", err)
+		return fmt.Errorf("loading policy template file: %w", err)
 	}
 
 	tpl := template.Must(template.New("").Funcs(template.FuncMap{
@@ -197,7 +195,7 @@ func generateBuiltin() error {
 			return nil // skip
 		}
 
-		return xerrors.Errorf("loading builtin template file: %w", err)
+		return fmt.Errorf("loading builtin template file: %w", err)
 	}
 
 	tpl := template.Must(template.New("").Funcs(template.FuncMap{

chain/actors/builtin/account/actor.go.template

@@ -2,7 +2,7 @@
 package account
 
 import (
-	"golang.org/x/xerrors"
+    "fmt"
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/cbor"
@@ -40,7 +40,7 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 		return load{{.}}(store, act.Head)
 {{end}}
 	}
-	return nil, xerrors.Errorf("unknown actor code %s", act.Code)
+	return nil, fmt.Errorf("unknown actor code %s", act.Code)
 }
 
 type State interface {

chain/actors/builtin/builtin.go.template

@@ -3,10 +3,10 @@ package builtin
 
 import (
 	"strings"
+	"fmt"
 
 	"github.com/filecoin-project/go-address"
 	"github.com/ipfs/go-cid"
-	"golang.org/x/xerrors"
 
 	{{range .versions}}
         builtin{{.}} "github.com/filecoin-project/specs-actors{{import .}}actors/builtin"
@@ -78,7 +78,7 @@ func RegisterActorState(code cid.Cid, loader ActorStateLoader) {
 func Load(store adt.Store, act *types.Actor) (cbor.Marshaler, error) {
 	loader, found := ActorStateLoaders[act.Code]
 	if !found {
-		return nil, xerrors.Errorf("unknown actor code %s", act.Code)
+		return nil, fmt.Errorf("unknown actor code %s", act.Code)
 	}
 	return loader(store, act.Head)
 }

chain/actors/builtin/init/actor.go.template

@@ -2,7 +2,7 @@
 package init
 
 import (
-	"golang.org/x/xerrors"
+    "fmt"
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
@@ -45,7 +45,7 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 		return load{{.}}(store, act.Head)
 {{end}}
 	}
-	return nil, xerrors.Errorf("unknown actor code %s", act.Code)
+	return nil, fmt.Errorf("unknown actor code %s", act.Code)
 }
 
 type State interface {

chain/actors/builtin/init/state.go.template

@@ -2,11 +2,11 @@
 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/lotus/node/modules/dtypes"
 
@@ -77,12 +77,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