gen fix

.circleci/config.yml

@@ -1018,7 +1018,6 @@ workflows:
           suite: utest-unit-cli
           target: "./cli/... ./cmd/... ./api/..."
           get-params: true
-          executor: golang-2xl
       - test:
           name: test-unit-node
           requires:
@@ -1026,7 +1025,6 @@ workflows:
           suite: utest-unit-node
           target: "./node/..."
           
-          
       - test:
           name: test-unit-rest
           requires:
@@ -1034,7 +1032,6 @@ workflows:
           suite: utest-unit-rest
           target: "./blockstore/... ./build/... ./chain/... ./conformance/... ./gateway/... ./journal/... ./lib/... ./markets/... ./paychmgr/... ./provider/... ./tools/..."
           
-          executor: golang-2xl
       - test:
           name: test-unit-storage
           requires:
@@ -1042,7 +1039,6 @@ workflows:
           suite: utest-unit-storage
           target: "./storage/... ./extern/..."
           
-          
       - test:
           go-test-flags: "-run=TestMulticoreSDR"
           requires:

.circleci/template.yml

@@ -567,8 +567,6 @@ workflows:
           suite: utest-[[ $suite ]]
           target: "[[ $pkgs ]]"
           [[if eq $suite "unit-cli"]]get-params: true[[end]]
-          [[if eq $suite "unit-cli"]]executor: golang-2xl[[end]]
-          [[- if eq $suite "unit-rest"]]executor: golang-2xl[[end]]
       [[- end]]
       - test:
           go-test-flags: "-run=TestMulticoreSDR"

api/api_common.go

@@ -4,11 +4,8 @@ import (
 	"context"
 	"fmt"
 	"time"
-
 	"github.com/google/uuid"
-
 	"github.com/filecoin-project/go-jsonrpc/auth"
-
 	apitypes "github.com/filecoin-project/lotus/api/types"
 	"github.com/filecoin-project/lotus/journal/alerting"
 )

api/api_errors.go

@@ -3,7 +3,6 @@ package api
 import (
 	"errors"
 	"reflect"
-
 	"github.com/filecoin-project/go-jsonrpc"
 )
 

api/api_full.go

@@ -5,12 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 	"time"
-
 	"github.com/google/uuid"
 	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
 	"github.com/libp2p/go-libp2p/core/peer"
-
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-bitfield"
 	datatransfer "github.com/filecoin-project/go-data-transfer/v2"
@@ -25,7 +23,6 @@ import (
 	"github.com/filecoin-project/go-state-types/crypto"
 	"github.com/filecoin-project/go-state-types/dline"
 	abinetwork "github.com/filecoin-project/go-state-types/network"
-
 	apitypes "github.com/filecoin-project/lotus/api/types"
 	"github.com/filecoin-project/lotus/chain/actors/builtin"
 	"github.com/filecoin-project/lotus/chain/actors/builtin/miner"

api/api_gateway.go

@@ -2,16 +2,13 @@ package api
 
 import (
 	"context"
-
 	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
-
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-jsonrpc"
 	"github.com/filecoin-project/go-state-types/abi"
 	verifregtypes "github.com/filecoin-project/go-state-types/builtin/v9/verifreg"
 	"github.com/filecoin-project/go-state-types/dline"
-
 	apitypes "github.com/filecoin-project/lotus/api/types"
 	"github.com/filecoin-project/lotus/chain/actors/builtin/miner"
 	"github.com/filecoin-project/lotus/chain/types"

api/api_net.go

@@ -3,7 +3,6 @@ package api
 import (
 	"context"
 	"time"
-
 	"github.com/libp2p/go-libp2p/core/metrics"
 	"github.com/libp2p/go-libp2p/core/network"
 	"github.com/libp2p/go-libp2p/core/peer"

api/api_storage.go

@@ -4,11 +4,9 @@ import (
 	"bytes"
 	"context"
 	"time"
-
 	"github.com/google/uuid"
 	"github.com/ipfs/go-cid"
 	"github.com/libp2p/go-libp2p/core/peer"
-
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-bitfield"
 	datatransfer "github.com/filecoin-project/go-data-transfer/v2"
@@ -20,7 +18,6 @@ import (
 	"github.com/filecoin-project/go-state-types/big"
 	"github.com/filecoin-project/go-state-types/builtin/v9/market"
 	abinetwork "github.com/filecoin-project/go-state-types/network"
-
 	builtinactors "github.com/filecoin-project/lotus/chain/actors/builtin"
 	"github.com/filecoin-project/lotus/chain/actors/builtin/miner"
 	"github.com/filecoin-project/lotus/chain/types"

api/api_test.go

@@ -10,10 +10,8 @@ import (
 	"runtime"
 	"strings"
 	"testing"
-
 	"github.com/stretchr/testify/require"
 	"golang.org/x/xerrors"
-
 	"github.com/filecoin-project/go-jsonrpc"
 )
 

api/api_wallet.go

@@ -2,10 +2,8 @@ package api
 
 import (
 	"context"
-
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/crypto"
-
 	"github.com/filecoin-project/lotus/chain/types"
 )
 

api/api_worker.go

@@ -2,13 +2,10 @@ package api
 
 import (
 	"context"
-
 	"github.com/google/uuid"
 	"github.com/ipfs/go-cid"
-
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/filecoin-project/go-state-types/proof"
-
 	"github.com/filecoin-project/lotus/storage/sealer/sealtasks"
 	"github.com/filecoin-project/lotus/storage/sealer/storiface"
 )

api/cbor_gen.go

@@ -7,11 +7,9 @@ import (
 	"io"
 	"math"
 	"sort"
-
 	cid "github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
 	xerrors "golang.org/x/xerrors"
-
 	abi "github.com/filecoin-project/go-state-types/abi"
 	paych "github.com/filecoin-project/go-state-types/builtin/v8/paych"
 	market "github.com/filecoin-project/go-state-types/builtin/v9/market"

api/client/client.go

@@ -6,9 +6,7 @@ import (
 	"net/url"
 	"path"
 	"time"
-
 	"github.com/filecoin-project/go-jsonrpc"
-
 	"github.com/filecoin-project/lotus/api"
 	"github.com/filecoin-project/lotus/api/v0api"
 	"github.com/filecoin-project/lotus/api/v1api"

api/docgen-openrpc/cmd/docgen_openrpc.go

@@ -6,7 +6,6 @@ import (
 	"io"
 	"log"
 	"os"
-
 	"github.com/filecoin-project/lotus/api/docgen"
 	docgen_openrpc "github.com/filecoin-project/lotus/api/docgen-openrpc"
 )

api/docgen-openrpc/openrpc.go

@@ -5,12 +5,10 @@ import (
 	"go/ast"
 	"net"
 	"reflect"
-
 	"github.com/alecthomas/jsonschema"
 	go_openrpc_reflect "github.com/etclabscore/go-openrpc-reflect"
 	"github.com/ipfs/go-cid"
 	meta_schema "github.com/open-rpc/meta-schema"
-
 	"github.com/filecoin-project/lotus/api/docgen"
 	"github.com/filecoin-project/lotus/build"
 )

api/docgen/cmd/docgen.go

@@ -7,7 +7,6 @@ import (
 	"reflect"
 	"sort"
 	"strings"
-
 	"github.com/filecoin-project/lotus/api/docgen"
 )
 

api/docgen/docgen.go

@@ -12,7 +12,6 @@ import (
 	"strings"
 	"time"
 	"unicode"
-
 	"github.com/google/uuid"
 	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
@@ -24,7 +23,6 @@ import (
 	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/libp2p/go-libp2p/core/protocol"
 	"github.com/multiformats/go-multiaddr"
-
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-bitfield"
 	datatransfer "github.com/filecoin-project/go-data-transfer/v2"
@@ -35,7 +33,6 @@ import (
 	"github.com/filecoin-project/go-state-types/builtin/v9/verifreg"
 	"github.com/filecoin-project/go-state-types/crypto"
 	"github.com/filecoin-project/go-state-types/exitcode"
-
 	"github.com/filecoin-project/lotus/api"
 	apitypes "github.com/filecoin-project/lotus/api/types"
 	"github.com/filecoin-project/lotus/api/v0api"

api/mocks/mock_full.go

@@ -33,7 +33,6 @@ import (
 	crypto "github.com/filecoin-project/go-state-types/crypto"
 	dline "github.com/filecoin-project/go-state-types/dline"
 	network "github.com/filecoin-project/go-state-types/network"
-
 	api "github.com/filecoin-project/lotus/api"
 	apitypes "github.com/filecoin-project/lotus/api/types"
 	miner0 "github.com/filecoin-project/lotus/chain/actors/builtin/miner"

api/proxy_gen.go

@@ -6,7 +6,6 @@ import (
 	"context"
 	"encoding/json"
 	"time"
-
 	"github.com/google/uuid"
 	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
@@ -15,7 +14,6 @@ import (
 	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/libp2p/go-libp2p/core/protocol"
 	"golang.org/x/xerrors"
-
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-bitfield"
 	datatransfer "github.com/filecoin-project/go-data-transfer/v2"
@@ -31,7 +29,6 @@ import (
 	"github.com/filecoin-project/go-state-types/dline"
 	abinetwork "github.com/filecoin-project/go-state-types/network"
 	"github.com/filecoin-project/go-state-types/proof"
-
 	apitypes "github.com/filecoin-project/lotus/api/types"
 	builtinactors "github.com/filecoin-project/lotus/chain/actors/builtin"
 	"github.com/filecoin-project/lotus/chain/actors/builtin/miner"

api/proxy_util_test.go

@@ -3,7 +3,6 @@ package api
 
 import (
 	"testing"
-
 	"github.com/stretchr/testify/require"
 )
 

api/types.go

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"time"
-
 	"github.com/google/uuid"
 	"github.com/ipfs/go-cid"
 	"github.com/ipfs/go-graphsync"
@@ -14,12 +13,10 @@ import (
 	"github.com/libp2p/go-libp2p/core/network"
 	"github.com/libp2p/go-libp2p/core/peer"
 	ma "github.com/multiformats/go-multiaddr"
-
 	"github.com/filecoin-project/go-address"
 	datatransfer "github.com/filecoin-project/go-data-transfer/v2"
 	"github.com/filecoin-project/go-fil-markets/retrievalmarket"
 	"github.com/filecoin-project/go-state-types/abi"
-
 	"github.com/filecoin-project/lotus/chain/actors/builtin/miner"
 	"github.com/filecoin-project/lotus/chain/types"
 	"github.com/filecoin-project/lotus/node/modules/dtypes"

api/utils.go

@@ -2,7 +2,6 @@ package api
 
 import (
 	"context"
-
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/crypto"
 )

api/v0api/full.go

@@ -2,12 +2,10 @@ package v0api
 
 import (
 	"context"
-
 	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
 	textselector "github.com/ipld/go-ipld-selector-text-lite"
 	"github.com/libp2p/go-libp2p/core/peer"
-
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-bitfield"
 	datatransfer "github.com/filecoin-project/go-data-transfer/v2"
@@ -19,7 +17,6 @@ import (
 	"github.com/filecoin-project/go-state-types/crypto"
 	"github.com/filecoin-project/go-state-types/dline"
 	abinetwork "github.com/filecoin-project/go-state-types/network"
-
 	"github.com/filecoin-project/lotus/api"
 	apitypes "github.com/filecoin-project/lotus/api/types"
 	"github.com/filecoin-project/lotus/chain/actors/builtin/miner"

api/v0api/gateway.go

@@ -2,16 +2,13 @@ package v0api
 
 import (
 	"context"
-
 	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
-
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
 	verifregtypes "github.com/filecoin-project/go-state-types/builtin/v9/verifreg"
 	"github.com/filecoin-project/go-state-types/dline"
 	abinetwork "github.com/filecoin-project/go-state-types/network"
-
 	"github.com/filecoin-project/lotus/api"
 	"github.com/filecoin-project/lotus/chain/actors/builtin/miner"
 	"github.com/filecoin-project/lotus/chain/types"

api/v0api/permissioned.go

@@ -2,7 +2,6 @@ package v0api
 
 import (
 	"github.com/filecoin-project/go-jsonrpc/auth"
-
 	"github.com/filecoin-project/lotus/api"
 )
 

api/v0api/proxy_gen.go

@@ -4,12 +4,10 @@ package v0api
 
 import (
 	"context"
-
 	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
 	"github.com/libp2p/go-libp2p/core/peer"
 	"golang.org/x/xerrors"
-
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-bitfield"
 	datatransfer "github.com/filecoin-project/go-data-transfer/v2"
@@ -21,7 +19,6 @@ import (
 	"github.com/filecoin-project/go-state-types/crypto"
 	"github.com/filecoin-project/go-state-types/dline"
 	abinetwork "github.com/filecoin-project/go-state-types/network"
-
 	"github.com/filecoin-project/lotus/api"
 	apitypes "github.com/filecoin-project/lotus/api/types"
 	"github.com/filecoin-project/lotus/chain/actors/builtin/miner"

api/v0api/v0mocks/mock_full.go

@@ -8,7 +8,6 @@ import (
 	context "context"
 	reflect "reflect"
 	time "time"
-
 	gomock "github.com/golang/mock/gomock"
 	uuid "github.com/google/uuid"
 	blocks "github.com/ipfs/go-block-format"
@@ -17,7 +16,6 @@ import (
 	network0 "github.com/libp2p/go-libp2p/core/network"
 	peer "github.com/libp2p/go-libp2p/core/peer"
 	protocol "github.com/libp2p/go-libp2p/core/protocol"
-
 	address "github.com/filecoin-project/go-address"
 	bitfield "github.com/filecoin-project/go-bitfield"
 	datatransfer "github.com/filecoin-project/go-data-transfer/v2"
@@ -32,7 +30,6 @@ import (
 	crypto "github.com/filecoin-project/go-state-types/crypto"
 	dline "github.com/filecoin-project/go-state-types/dline"
 	network "github.com/filecoin-project/go-state-types/network"
-
 	api "github.com/filecoin-project/lotus/api"
 	apitypes "github.com/filecoin-project/lotus/api/types"
 	v0api "github.com/filecoin-project/lotus/api/v0api"

api/v0api/v1_wrapper.go

@@ -2,18 +2,15 @@ package v0api
 
 import (
 	"context"
-
 	"github.com/ipfs/go-cid"
 	"github.com/libp2p/go-libp2p/core/peer"
 	"golang.org/x/xerrors"
-
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-fil-markets/retrievalmarket"
 	"github.com/filecoin-project/go-fil-markets/storagemarket"
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/filecoin-project/go-state-types/big"
 	"github.com/filecoin-project/go-state-types/crypto"
-
 	"github.com/filecoin-project/lotus/api"
 	"github.com/filecoin-project/lotus/api/v1api"
 	"github.com/filecoin-project/lotus/chain/actors/builtin/miner"

blockstore/splitstore/splitstore.go

@@ -18,7 +18,6 @@ import (
 	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/go-state-types/abi"
-
 	bstore "github.com/filecoin-project/lotus/blockstore"
 	"github.com/filecoin-project/lotus/build"
 	"github.com/filecoin-project/lotus/chain/stmgr"

blockstore/splitstore/splitstore_compact.go

@@ -19,7 +19,6 @@ import (
 	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/go-state-types/abi"
-
 	"github.com/filecoin-project/lotus/build"
 	"github.com/filecoin-project/lotus/chain/types"
 	"github.com/filecoin-project/lotus/metrics"

blockstore/splitstore/splitstore_test.go

@@ -20,7 +20,6 @@ import (
 	mh "github.com/multiformats/go-multihash"
 
 	"github.com/filecoin-project/go-state-types/abi"
-
 	"github.com/filecoin-project/lotus/blockstore"
 	"github.com/filecoin-project/lotus/chain/stmgr"
 	"github.com/filecoin-project/lotus/chain/types"

blockstore/splitstore/splitstore_warmup.go

@@ -11,7 +11,6 @@ import (
 	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/go-state-types/abi"
-
 	"github.com/filecoin-project/lotus/build"
 	"github.com/filecoin-project/lotus/chain/types"
 )

build/bootstrap.go

@@ -5,9 +5,7 @@ import (
 	"embed"
 	"path"
 	"strings"
-
 	"github.com/libp2p/go-libp2p/core/peer"
-
 	"github.com/filecoin-project/lotus/lib/addrutil"
 )
 

build/builtin_actors.go

@@ -11,15 +11,12 @@ import (
 	"sort"
 	"strconv"
 	"strings"
-
 	"github.com/DataDog/zstd"
 	"github.com/ipfs/go-cid"
 	cbor "github.com/ipfs/go-ipld-cbor"
 	"github.com/ipld/go-car"
 	"golang.org/x/xerrors"
-
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
-
 	"github.com/filecoin-project/lotus/blockstore"
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"

build/builtin_actors_test.go

@@ -2,12 +2,9 @@ package build_test
 
 import (
 	"testing"
-
 	"github.com/stretchr/testify/require"
-
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	"github.com/filecoin-project/go-state-types/manifest"
-
 	"github.com/filecoin-project/lotus/build"
 	"github.com/filecoin-project/lotus/chain/actors"
 )

build/drand.go

@@ -2,7 +2,6 @@ package build
 
 import (
 	"sort"
-
 	"github.com/filecoin-project/lotus/node/modules/dtypes"
 )
 

build/genesis.go

@@ -3,7 +3,6 @@ package build
 import (
 	"embed"
 	"path"
-
 	logging "github.com/ipfs/go-log/v2"
 )
 

build/openrpc.go

@@ -5,7 +5,6 @@ import (
 	"compress/gzip"
 	"embed"
 	"encoding/json"
-
 	apitypes "github.com/filecoin-project/lotus/api/types"
 )
 

build/openrpc_test.go

@@ -3,7 +3,6 @@ package build
 
 import (
 	"testing"
-
 	apitypes "github.com/filecoin-project/lotus/api/types"
 )
 

build/panic_reporter.go

@@ -10,7 +10,6 @@ import (
 	"strconv"
 	"strings"
 	"time"
-
 	"github.com/icza/backscanner"
 	logging "github.com/ipfs/go-log/v2"
 )

build/params_2k.go

@@ -6,13 +6,10 @@ package build
 import (
 	"os"
 	"strconv"
-
 	"github.com/ipfs/go-cid"
-
 	"github.com/filecoin-project/go-state-types/abi"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	"github.com/filecoin-project/go-state-types/network"
-
 	"github.com/filecoin-project/lotus/chain/actors/policy"
 )
 

build/params_butterfly.go

@@ -5,13 +5,11 @@ package build
 
 import (
 	"github.com/ipfs/go-cid"
-
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	"github.com/filecoin-project/go-state-types/network"
 	builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin"
-
 	"github.com/filecoin-project/lotus/chain/actors/policy"
 )
 

build/params_calibnet.go

@@ -6,15 +6,12 @@ package build
 import (
 	"os"
 	"strconv"
-
 	"github.com/ipfs/go-cid"
-
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	"github.com/filecoin-project/go-state-types/network"
 	builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin"
-
 	"github.com/filecoin-project/lotus/chain/actors/policy"
 )
 

build/params_interop.go

@@ -6,15 +6,12 @@ package build
 import (
 	"os"
 	"strconv"
-
 	"github.com/ipfs/go-cid"
-
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	"github.com/filecoin-project/go-state-types/network"
 	builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin"
-
 	"github.com/filecoin-project/lotus/chain/actors/policy"
 )
 

build/params_mainnet.go

@@ -7,7 +7,6 @@ import (
 	"math"
 	"os"
 	"strconv"
-
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"

build/params_shared_funcs.go

@@ -3,9 +3,7 @@ package build
 import (
 	"github.com/ipfs/go-cid"
 	"github.com/libp2p/go-libp2p/core/protocol"
-
 	"github.com/filecoin-project/go-address"
-
 	"github.com/filecoin-project/lotus/node/modules/dtypes"
 )
 

build/params_shared_vals.go

@@ -6,12 +6,10 @@ package build
 import (
 	"math/big"
 	"os"
-
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/filecoin-project/go-state-types/network"
 	builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin"
-
 	"github.com/filecoin-project/lotus/chain/actors/policy"
 )
 

build/params_testground.go

@@ -9,14 +9,11 @@ package build
 
 import (
 	"math/big"
-
 	"github.com/ipfs/go-cid"
-
 	"github.com/filecoin-project/go-state-types/abi"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	"github.com/filecoin-project/go-state-types/network"
 	builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin"
-
 	"github.com/filecoin-project/lotus/chain/actors/policy"
 )
 

chain/actors/adt/diff_adt_test.go

@@ -12,10 +12,9 @@ import (
 	typegen "github.com/whyrusleeping/cbor-gen"
 
 	"github.com/filecoin-project/go-state-types/abi"
+	bstore "github.com/filecoin-project/lotus/blockstore"
 	builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin"
 	adt2 "github.com/filecoin-project/specs-actors/v2/actors/util/adt"
-
-	bstore "github.com/filecoin-project/lotus/blockstore"
 )
 
 func TestDiffAdtArray(t *testing.T) {

chain/actors/aerrors/error_test.go

@@ -8,7 +8,6 @@ import (
 	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/go-state-types/exitcode"
-
 	. "github.com/filecoin-project/lotus/chain/actors/aerrors"
 )
 

chain/actors/builtin/account/account.go

@@ -9,6 +9,9 @@ import (
 	builtin12 "github.com/filecoin-project/go-state-types/builtin"
 	"github.com/filecoin-project/go-state-types/cbor"
 	"github.com/filecoin-project/go-state-types/manifest"
+	"github.com/filecoin-project/lotus/chain/actors"
+	"github.com/filecoin-project/lotus/chain/actors/adt"
+	"github.com/filecoin-project/lotus/chain/types"
 	builtin0 "github.com/filecoin-project/specs-actors/actors/builtin"
 	builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin"
 	builtin3 "github.com/filecoin-project/specs-actors/v3/actors/builtin"
@@ -16,10 +19,6 @@ import (
 	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/filecoin-project/lotus/chain/actors"
-	"github.com/filecoin-project/lotus/chain/actors/adt"
-	"github.com/filecoin-project/lotus/chain/types"
 )
 
 var Methods = builtin12.MethodsAccount

chain/actors/builtin/account/v0.go

@@ -8,10 +8,9 @@ import (
 	"github.com/filecoin-project/go-address"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	"github.com/filecoin-project/go-state-types/manifest"
-	account0 "github.com/filecoin-project/specs-actors/actors/builtin/account"
-
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
+	account0 "github.com/filecoin-project/specs-actors/actors/builtin/account"
 )
 
 var _ State = (*state0)(nil)

chain/actors/builtin/account/v10.go

@@ -9,7 +9,6 @@ import (
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	account10 "github.com/filecoin-project/go-state-types/builtin/v10/account"
 	"github.com/filecoin-project/go-state-types/manifest"
-
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 )

chain/actors/builtin/account/v11.go

@@ -9,7 +9,6 @@ import (
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	account11 "github.com/filecoin-project/go-state-types/builtin/v11/account"
 	"github.com/filecoin-project/go-state-types/manifest"
-
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 )

chain/actors/builtin/account/v12.go

@@ -9,7 +9,6 @@ import (
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	account12 "github.com/filecoin-project/go-state-types/builtin/v12/account"
 	"github.com/filecoin-project/go-state-types/manifest"
-
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 )

chain/actors/builtin/account/v2.go

@@ -8,10 +8,9 @@ import (
 	"github.com/filecoin-project/go-address"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	"github.com/filecoin-project/go-state-types/manifest"
-	account2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/account"
-
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
+	account2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/account"
 )
 
 var _ State = (*state2)(nil)

chain/actors/builtin/account/v3.go

@@ -8,10 +8,9 @@ import (
 	"github.com/filecoin-project/go-address"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	"github.com/filecoin-project/go-state-types/manifest"
-	account3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/account"
-
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
+	account3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/account"
 )
 
 var _ State = (*state3)(nil)

chain/actors/builtin/account/v4.go

@@ -8,10 +8,9 @@ import (
 	"github.com/filecoin-project/go-address"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	"github.com/filecoin-project/go-state-types/manifest"
-	account4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/account"
-
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
+	account4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/account"
 )
 
 var _ State = (*state4)(nil)

chain/actors/builtin/account/v5.go

@@ -8,10 +8,9 @@ import (
 	"github.com/filecoin-project/go-address"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	"github.com/filecoin-project/go-state-types/manifest"
-	account5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/account"
-
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
+	account5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/account"
 )
 
 var _ State = (*state5)(nil)

chain/actors/builtin/account/v6.go

@@ -8,10 +8,9 @@ import (
 	"github.com/filecoin-project/go-address"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	"github.com/filecoin-project/go-state-types/manifest"
-	account6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/account"
-
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
+	account6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/account"
 )
 
 var _ State = (*state6)(nil)

chain/actors/builtin/account/v7.go

@@ -8,10 +8,9 @@ import (
 	"github.com/filecoin-project/go-address"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	"github.com/filecoin-project/go-state-types/manifest"
-	account7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/account"
-
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
+	account7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/account"
 )
 
 var _ State = (*state7)(nil)

chain/actors/builtin/account/v8.go

@@ -9,7 +9,6 @@ import (
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	account8 "github.com/filecoin-project/go-state-types/builtin/v8/account"
 	"github.com/filecoin-project/go-state-types/manifest"
-
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 )

chain/actors/builtin/account/v9.go

@@ -9,7 +9,6 @@ import (
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	account9 "github.com/filecoin-project/go-state-types/builtin/v9/account"
 	"github.com/filecoin-project/go-state-types/manifest"
-
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 )

chain/actors/builtin/builtin.go

@@ -12,6 +12,7 @@ import (
 	minertypes "github.com/filecoin-project/go-state-types/builtin/v9/miner"
 	"github.com/filecoin-project/go-state-types/manifest"
 	"github.com/filecoin-project/go-state-types/proof"
+	"github.com/filecoin-project/lotus/chain/actors"
 	builtin0 "github.com/filecoin-project/specs-actors/actors/builtin"
 	builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin"
 	builtin3 "github.com/filecoin-project/specs-actors/v3/actors/builtin"
@@ -19,8 +20,6 @@ import (
 	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/filecoin-project/lotus/chain/actors"
 )
 
 var InitActorAddr = builtin.InitActorAddr

chain/actors/builtin/cron/cron.go

@@ -7,6 +7,9 @@ import (
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	builtin12 "github.com/filecoin-project/go-state-types/builtin"
 	"github.com/filecoin-project/go-state-types/manifest"
+	"github.com/filecoin-project/lotus/chain/actors"
+	"github.com/filecoin-project/lotus/chain/actors/adt"
+	"github.com/filecoin-project/lotus/chain/types"
 	builtin0 "github.com/filecoin-project/specs-actors/actors/builtin"
 	builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin"
 	builtin3 "github.com/filecoin-project/specs-actors/v3/actors/builtin"
@@ -14,10 +17,6 @@ import (
 	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/filecoin-project/lotus/chain/actors"
-	"github.com/filecoin-project/lotus/chain/actors/adt"
-	"github.com/filecoin-project/lotus/chain/types"
 )
 
 func Load(store adt.Store, act *types.Actor) (State, error) {

chain/actors/builtin/cron/v0.go

@@ -7,10 +7,9 @@ import (
 
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	"github.com/filecoin-project/go-state-types/manifest"
-	cron0 "github.com/filecoin-project/specs-actors/actors/builtin/cron"
-
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
+	cron0 "github.com/filecoin-project/specs-actors/actors/builtin/cron"
 )
 
 var _ State = (*state0)(nil)

chain/actors/builtin/cron/v10.go

@@ -8,7 +8,6 @@ import (
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	cron10 "github.com/filecoin-project/go-state-types/builtin/v10/cron"
 	"github.com/filecoin-project/go-state-types/manifest"
-
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 )

chain/actors/builtin/cron/v11.go

@@ -8,7 +8,6 @@ import (
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	cron11 "github.com/filecoin-project/go-state-types/builtin/v11/cron"
 	"github.com/filecoin-project/go-state-types/manifest"
-
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 )

chain/actors/builtin/cron/v12.go

@@ -8,7 +8,6 @@ import (
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	cron12 "github.com/filecoin-project/go-state-types/builtin/v12/cron"
 	"github.com/filecoin-project/go-state-types/manifest"
-
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 )

chain/actors/builtin/cron/v2.go

@@ -7,10 +7,9 @@ import (
 
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	"github.com/filecoin-project/go-state-types/manifest"
-	cron2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/cron"
-
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
+	cron2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/cron"
 )
 
 var _ State = (*state2)(nil)

chain/actors/builtin/cron/v3.go

@@ -7,10 +7,9 @@ import (
 
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	"github.com/filecoin-project/go-state-types/manifest"
-	cron3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/cron"
-
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
+	cron3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/cron"
 )
 
 var _ State = (*state3)(nil)

chain/actors/builtin/cron/v4.go

@@ -7,10 +7,9 @@ import (
 
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	"github.com/filecoin-project/go-state-types/manifest"
-	cron4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/cron"
-
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
+	cron4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/cron"
 )
 
 var _ State = (*state4)(nil)

chain/actors/builtin/cron/v5.go

@@ -7,10 +7,9 @@ import (
 
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	"github.com/filecoin-project/go-state-types/manifest"
-	cron5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/cron"
-
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
+	cron5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/cron"
 )
 
 var _ State = (*state5)(nil)

chain/actors/builtin/cron/v6.go

@@ -7,10 +7,9 @@ import (
 
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	"github.com/filecoin-project/go-state-types/manifest"
-	cron6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/cron"
-
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
+	cron6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/cron"
 )
 
 var _ State = (*state6)(nil)

chain/actors/builtin/cron/v7.go

@@ -7,10 +7,9 @@ import (
 
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	"github.com/filecoin-project/go-state-types/manifest"
-	cron7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/cron"
-
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
+	cron7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/cron"
 )
 
 var _ State = (*state7)(nil)

chain/actors/builtin/cron/v8.go

@@ -8,7 +8,6 @@ import (
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	cron8 "github.com/filecoin-project/go-state-types/builtin/v8/cron"
 	"github.com/filecoin-project/go-state-types/manifest"
-
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 )

chain/actors/builtin/cron/v9.go

@@ -8,7 +8,6 @@ import (
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	cron9 "github.com/filecoin-project/go-state-types/builtin/v9/cron"
 	"github.com/filecoin-project/go-state-types/manifest"
-
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 )

chain/actors/builtin/datacap/datacap.go

@@ -10,7 +10,6 @@ import (
 	builtin12 "github.com/filecoin-project/go-state-types/builtin"
 	"github.com/filecoin-project/go-state-types/cbor"
 	"github.com/filecoin-project/go-state-types/manifest"
-
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 	"github.com/filecoin-project/lotus/chain/types"

chain/actors/builtin/datacap/util.go

@@ -8,7 +8,6 @@ import (
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/filecoin-project/go-state-types/big"
 	"github.com/filecoin-project/go-state-types/builtin/v9/verifreg"
-
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 )

chain/actors/builtin/datacap/v10.go

@@ -11,7 +11,6 @@ import (
 	datacap10 "github.com/filecoin-project/go-state-types/builtin/v10/datacap"
 	adt10 "github.com/filecoin-project/go-state-types/builtin/v10/util/adt"
 	"github.com/filecoin-project/go-state-types/manifest"
-
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 )

chain/actors/builtin/datacap/v11.go

@@ -11,7 +11,6 @@ import (
 	datacap11 "github.com/filecoin-project/go-state-types/builtin/v11/datacap"
 	adt11 "github.com/filecoin-project/go-state-types/builtin/v11/util/adt"
 	"github.com/filecoin-project/go-state-types/manifest"
-
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 )

chain/actors/builtin/datacap/v12.go

@@ -11,7 +11,6 @@ import (
 	datacap12 "github.com/filecoin-project/go-state-types/builtin/v12/datacap"
 	adt12 "github.com/filecoin-project/go-state-types/builtin/v12/util/adt"
 	"github.com/filecoin-project/go-state-types/manifest"
-
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 )

chain/actors/builtin/datacap/v9.go

@@ -11,7 +11,6 @@ import (
 	datacap9 "github.com/filecoin-project/go-state-types/builtin/v9/datacap"
 	adt9 "github.com/filecoin-project/go-state-types/builtin/v9/util/adt"
 	"github.com/filecoin-project/go-state-types/manifest"
-
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 )

chain/actors/builtin/evm/evm.go

@@ -8,7 +8,6 @@ import (
 	builtin12 "github.com/filecoin-project/go-state-types/builtin"
 	"github.com/filecoin-project/go-state-types/cbor"
 	"github.com/filecoin-project/go-state-types/manifest"
-
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 	"github.com/filecoin-project/lotus/chain/types"

chain/actors/builtin/evm/v10.go

@@ -5,7 +5,6 @@ import (
 
 	"github.com/filecoin-project/go-state-types/abi"
 	evm10 "github.com/filecoin-project/go-state-types/builtin/v10/evm"
-
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 )
 

chain/actors/builtin/evm/v11.go

@@ -5,7 +5,6 @@ import (
 
 	"github.com/filecoin-project/go-state-types/abi"
 	evm11 "github.com/filecoin-project/go-state-types/builtin/v11/evm"
-
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 )
 

chain/actors/builtin/evm/v12.go

@@ -5,7 +5,6 @@ import (
 
 	"github.com/filecoin-project/go-state-types/abi"
 	evm12 "github.com/filecoin-project/go-state-types/builtin/v12/evm"
-
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 )
 

chain/actors/builtin/init/diff.go

@@ -7,7 +7,6 @@ import (
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
-
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 )
 

chain/actors/builtin/init/init.go

@@ -10,6 +10,10 @@ import (
 	builtin12 "github.com/filecoin-project/go-state-types/builtin"
 	"github.com/filecoin-project/go-state-types/cbor"
 	"github.com/filecoin-project/go-state-types/manifest"
+	"github.com/filecoin-project/lotus/chain/actors"
+	"github.com/filecoin-project/lotus/chain/actors/adt"
+	"github.com/filecoin-project/lotus/chain/types"
+	"github.com/filecoin-project/lotus/node/modules/dtypes"
 	builtin0 "github.com/filecoin-project/specs-actors/actors/builtin"
 	builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin"
 	builtin3 "github.com/filecoin-project/specs-actors/v3/actors/builtin"
@@ -17,11 +21,6 @@ import (
 	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/filecoin-project/lotus/chain/actors"
-	"github.com/filecoin-project/lotus/chain/actors/adt"
-	"github.com/filecoin-project/lotus/chain/types"
-	"github.com/filecoin-project/lotus/node/modules/dtypes"
 )
 
 var (

chain/actors/builtin/init/v0.go

@@ -12,12 +12,11 @@ import (
 	"github.com/filecoin-project/go-state-types/abi"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	"github.com/filecoin-project/go-state-types/manifest"
-	init0 "github.com/filecoin-project/specs-actors/actors/builtin/init"
-	adt0 "github.com/filecoin-project/specs-actors/actors/util/adt"
-
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 	"github.com/filecoin-project/lotus/node/modules/dtypes"
+	init0 "github.com/filecoin-project/specs-actors/actors/builtin/init"
+	adt0 "github.com/filecoin-project/specs-actors/actors/util/adt"
 )
 
 var _ State = (*state0)(nil)

chain/actors/builtin/init/v10.go

@@ -15,7 +15,6 @@ import (
 	init10 "github.com/filecoin-project/go-state-types/builtin/v10/init"
 	adt10 "github.com/filecoin-project/go-state-types/builtin/v10/util/adt"
 	"github.com/filecoin-project/go-state-types/manifest"
-
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 	"github.com/filecoin-project/lotus/node/modules/dtypes"

chain/actors/builtin/init/v11.go

@@ -15,7 +15,6 @@ import (
 	init11 "github.com/filecoin-project/go-state-types/builtin/v11/init"
 	adt11 "github.com/filecoin-project/go-state-types/builtin/v11/util/adt"
 	"github.com/filecoin-project/go-state-types/manifest"
-
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 	"github.com/filecoin-project/lotus/node/modules/dtypes"

chain/actors/builtin/init/v12.go

@@ -15,7 +15,6 @@ import (
 	init12 "github.com/filecoin-project/go-state-types/builtin/v12/init"
 	adt12 "github.com/filecoin-project/go-state-types/builtin/v12/util/adt"
 	"github.com/filecoin-project/go-state-types/manifest"
-
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 	"github.com/filecoin-project/lotus/node/modules/dtypes"

chain/actors/builtin/init/v2.go

@@ -12,12 +12,11 @@ import (
 	"github.com/filecoin-project/go-state-types/abi"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	"github.com/filecoin-project/go-state-types/manifest"
-	init2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/init"
-	adt2 "github.com/filecoin-project/specs-actors/v2/actors/util/adt"
-
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 	"github.com/filecoin-project/lotus/node/modules/dtypes"
+	init2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/init"
+	adt2 "github.com/filecoin-project/specs-actors/v2/actors/util/adt"
 )
 
 var _ State = (*state2)(nil)

chain/actors/builtin/init/v3.go

@@ -12,13 +12,12 @@ import (
 	"github.com/filecoin-project/go-state-types/abi"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	"github.com/filecoin-project/go-state-types/manifest"
-	builtin3 "github.com/filecoin-project/specs-actors/v3/actors/builtin"
-	init3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/init"
-	adt3 "github.com/filecoin-project/specs-actors/v3/actors/util/adt"
-
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 	"github.com/filecoin-project/lotus/node/modules/dtypes"
+	builtin3 "github.com/filecoin-project/specs-actors/v3/actors/builtin"
+	init3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/init"
+	adt3 "github.com/filecoin-project/specs-actors/v3/actors/util/adt"
 )
 
 var _ State = (*state3)(nil)

chain/actors/builtin/init/v4.go

@@ -12,13 +12,12 @@ import (
 	"github.com/filecoin-project/go-state-types/abi"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	"github.com/filecoin-project/go-state-types/manifest"
-	builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin"
-	init4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/init"
-	adt4 "github.com/filecoin-project/specs-actors/v4/actors/util/adt"
-
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 	"github.com/filecoin-project/lotus/node/modules/dtypes"
+	builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin"
+	init4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/init"
+	adt4 "github.com/filecoin-project/specs-actors/v4/actors/util/adt"
 )
 
 var _ State = (*state4)(nil)

chain/actors/builtin/init/v5.go

@@ -12,13 +12,12 @@ import (
 	"github.com/filecoin-project/go-state-types/abi"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	"github.com/filecoin-project/go-state-types/manifest"
-	builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin"
-	init5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/init"
-	adt5 "github.com/filecoin-project/specs-actors/v5/actors/util/adt"
-
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 	"github.com/filecoin-project/lotus/node/modules/dtypes"
+	builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin"
+	init5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/init"
+	adt5 "github.com/filecoin-project/specs-actors/v5/actors/util/adt"
 )
 
 var _ State = (*state5)(nil)

chain/actors/builtin/init/v6.go

@@ -12,13 +12,12 @@ import (
 	"github.com/filecoin-project/go-state-types/abi"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	"github.com/filecoin-project/go-state-types/manifest"
-	builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin"
-	init6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/init"
-	adt6 "github.com/filecoin-project/specs-actors/v6/actors/util/adt"
-
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 	"github.com/filecoin-project/lotus/node/modules/dtypes"
+	builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin"
+	init6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/init"
+	adt6 "github.com/filecoin-project/specs-actors/v6/actors/util/adt"
 )
 
 var _ State = (*state6)(nil)

chain/actors/builtin/init/v7.go

@@ -12,13 +12,12 @@ import (
 	"github.com/filecoin-project/go-state-types/abi"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	"github.com/filecoin-project/go-state-types/manifest"
-	builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin"
-	init7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/init"
-	adt7 "github.com/filecoin-project/specs-actors/v7/actors/util/adt"
-
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 	"github.com/filecoin-project/lotus/node/modules/dtypes"
+	builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin"
+	init7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/init"
+	adt7 "github.com/filecoin-project/specs-actors/v7/actors/util/adt"
 )
 
 var _ State = (*state7)(nil)

chain/actors/builtin/init/v8.go

@@ -15,7 +15,6 @@ import (
 	init8 "github.com/filecoin-project/go-state-types/builtin/v8/init"
 	adt8 "github.com/filecoin-project/go-state-types/builtin/v8/util/adt"
 	"github.com/filecoin-project/go-state-types/manifest"
-
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 	"github.com/filecoin-project/lotus/node/modules/dtypes"