diff --git a/Makefile b/Makefile index 74a7bf027..cede9f66e 100644 --- a/Makefile +++ b/Makefile @@ -11,12 +11,12 @@ build: test: $(GO_BIN) test ./... - $(GO_BIN) test -race ./actors/migration/nv14/test + $(GO_BIN) test -race ./actors/migration/nv15/test .PHONY: test test-migration: .PHONY: test-migration - $(GO_BIN) test -race ./actors/migration/nv14/test + $(GO_BIN) test -race ./actors/migration/nv15/test test-coverage: $(GO_BIN) test -coverprofile=coverage.out ./... diff --git a/actors/builtin/account/account_actor.go b/actors/builtin/account/account_actor.go index 39672ae38..603b944fe 100644 --- a/actors/builtin/account/account_actor.go +++ b/actors/builtin/account/account_actor.go @@ -7,8 +7,8 @@ import ( "github.com/filecoin-project/go-state-types/exitcode" "github.com/ipfs/go-cid" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/runtime" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/runtime" ) type Actor struct{} diff --git a/actors/builtin/account/account_test.go b/actors/builtin/account/account_test.go index 4e2ad5364..08d1bf21f 100644 --- a/actors/builtin/account/account_test.go +++ b/actors/builtin/account/account_test.go @@ -9,10 +9,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/account" - "github.com/filecoin-project/specs-actors/v6/support/mock" - tutil "github.com/filecoin-project/specs-actors/v6/support/testing" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/account" + "github.com/filecoin-project/specs-actors/v7/support/mock" + tutil "github.com/filecoin-project/specs-actors/v7/support/testing" ) type constructorTestCase struct { diff --git a/actors/builtin/account/testing.go b/actors/builtin/account/testing.go index 23dc65cfd..085fd55d9 100644 --- a/actors/builtin/account/testing.go +++ b/actors/builtin/account/testing.go @@ -3,7 +3,7 @@ package account import ( "github.com/filecoin-project/go-address" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" ) type StateSummary struct { diff --git a/actors/builtin/codes.go b/actors/builtin/codes.go index 6f6bf3d58..e0f899b95 100644 --- a/actors/builtin/codes.go +++ b/actors/builtin/codes.go @@ -35,17 +35,17 @@ func init() { builtinActors = make(map[cid.Cid]*actorInfo) for id, info := range map[*cid.Cid]*actorInfo{ //nolint:nomaprange - &SystemActorCodeID: {name: "fil/6/system"}, - &InitActorCodeID: {name: "fil/6/init"}, - &CronActorCodeID: {name: "fil/6/cron"}, - &StoragePowerActorCodeID: {name: "fil/6/storagepower"}, - &StorageMinerActorCodeID: {name: "fil/6/storageminer"}, - &StorageMarketActorCodeID: {name: "fil/6/storagemarket"}, - &PaymentChannelActorCodeID: {name: "fil/6/paymentchannel"}, - &RewardActorCodeID: {name: "fil/6/reward"}, - &VerifiedRegistryActorCodeID: {name: "fil/6/verifiedregistry"}, - &AccountActorCodeID: {name: "fil/6/account", signer: true}, - &MultisigActorCodeID: {name: "fil/6/multisig", signer: true}, + &SystemActorCodeID: {name: "fil/7/system"}, + &InitActorCodeID: {name: "fil/7/init"}, + &CronActorCodeID: {name: "fil/7/cron"}, + &StoragePowerActorCodeID: {name: "fil/7/storagepower"}, + &StorageMinerActorCodeID: {name: "fil/7/storageminer"}, + &StorageMarketActorCodeID: {name: "fil/7/storagemarket"}, + &PaymentChannelActorCodeID: {name: "fil/7/paymentchannel"}, + &RewardActorCodeID: {name: "fil/7/reward"}, + &VerifiedRegistryActorCodeID: {name: "fil/7/verifiedregistry"}, + &AccountActorCodeID: {name: "fil/7/account", signer: true}, + &MultisigActorCodeID: {name: "fil/7/multisig", signer: true}, } { c, err := builder.Sum([]byte(info.name)) if err != nil { diff --git a/actors/builtin/cron/cron_actor.go b/actors/builtin/cron/cron_actor.go index 1f06fa6ba..9853e0199 100644 --- a/actors/builtin/cron/cron_actor.go +++ b/actors/builtin/cron/cron_actor.go @@ -7,8 +7,8 @@ import ( cron0 "github.com/filecoin-project/specs-actors/actors/builtin/cron" "github.com/ipfs/go-cid" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/runtime" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/runtime" ) // The cron actor is a built-in singleton that sends messages to other registered actors at the end of each epoch. diff --git a/actors/builtin/cron/cron_state.go b/actors/builtin/cron/cron_state.go index b701f8d78..811ace2d2 100644 --- a/actors/builtin/cron/cron_state.go +++ b/actors/builtin/cron/cron_state.go @@ -4,7 +4,7 @@ import ( addr "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" ) type State struct { diff --git a/actors/builtin/cron/cron_test.go b/actors/builtin/cron/cron_test.go index 5059f86f1..77d521c35 100644 --- a/actors/builtin/cron/cron_test.go +++ b/actors/builtin/cron/cron_test.go @@ -8,10 +8,10 @@ import ( "github.com/filecoin-project/go-state-types/exitcode" "github.com/stretchr/testify/assert" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/cron" - "github.com/filecoin-project/specs-actors/v6/support/mock" - tutil "github.com/filecoin-project/specs-actors/v6/support/testing" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/cron" + "github.com/filecoin-project/specs-actors/v7/support/mock" + tutil "github.com/filecoin-project/specs-actors/v7/support/testing" ) func TestExports(t *testing.T) { diff --git a/actors/builtin/cron/testing.go b/actors/builtin/cron/testing.go index 32efaf399..89ae37fc9 100644 --- a/actors/builtin/cron/testing.go +++ b/actors/builtin/cron/testing.go @@ -2,8 +2,8 @@ package cron import ( "github.com/filecoin-project/go-address" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/util/adt" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/util/adt" ) type StateSummary struct { diff --git a/actors/builtin/exported/actors.go b/actors/builtin/exported/actors.go index 51ef01991..dfe4640b3 100644 --- a/actors/builtin/exported/actors.go +++ b/actors/builtin/exported/actors.go @@ -1,18 +1,18 @@ package exported import ( - "github.com/filecoin-project/specs-actors/v6/actors/builtin/account" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/cron" - init_ "github.com/filecoin-project/specs-actors/v6/actors/builtin/init" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/market" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/miner" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/multisig" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/paych" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/power" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/reward" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/system" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/verifreg" - "github.com/filecoin-project/specs-actors/v6/actors/runtime" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/account" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/cron" + init_ "github.com/filecoin-project/specs-actors/v7/actors/builtin/init" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/market" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/miner" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/multisig" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/paych" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/power" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/reward" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/system" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/verifreg" + "github.com/filecoin-project/specs-actors/v7/actors/runtime" ) func BuiltinActors() []runtime.VMActor { diff --git a/actors/builtin/exported/actors_test.go b/actors/builtin/exported/actors_test.go index 30f40cf49..a2c80074d 100644 --- a/actors/builtin/exported/actors_test.go +++ b/actors/builtin/exported/actors_test.go @@ -7,19 +7,19 @@ import ( "testing" "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/account" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/cron" - init_ "github.com/filecoin-project/specs-actors/v6/actors/builtin/init" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/market" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/miner" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/multisig" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/paych" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/power" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/reward" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/system" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/verifreg" - "github.com/filecoin-project/specs-actors/v6/actors/runtime" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/account" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/cron" + init_ "github.com/filecoin-project/specs-actors/v7/actors/builtin/init" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/market" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/miner" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/multisig" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/paych" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/power" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/reward" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/system" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/verifreg" + "github.com/filecoin-project/specs-actors/v7/actors/runtime" "github.com/ipfs/go-cid" "github.com/stretchr/testify/require" diff --git a/actors/builtin/init/init_actor.go b/actors/builtin/init/init_actor.go index 3630c92fd..f418d4573 100644 --- a/actors/builtin/init/init_actor.go +++ b/actors/builtin/init/init_actor.go @@ -8,9 +8,9 @@ import ( init0 "github.com/filecoin-project/specs-actors/actors/builtin/init" cid "github.com/ipfs/go-cid" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/runtime" - "github.com/filecoin-project/specs-actors/v6/actors/util/adt" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/runtime" + "github.com/filecoin-project/specs-actors/v7/actors/util/adt" ) // The init actor uniquely has the power to create new actors. diff --git a/actors/builtin/init/init_actor_state.go b/actors/builtin/init/init_actor_state.go index 64081878b..d0c4f37d2 100644 --- a/actors/builtin/init/init_actor_state.go +++ b/actors/builtin/init/init_actor_state.go @@ -7,8 +7,8 @@ import ( cbg "github.com/whyrusleeping/cbor-gen" xerrors "golang.org/x/xerrors" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/util/adt" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/util/adt" ) type State struct { diff --git a/actors/builtin/init/init_test.go b/actors/builtin/init/init_test.go index 4225005de..b4d031912 100644 --- a/actors/builtin/init/init_test.go +++ b/actors/builtin/init/init_test.go @@ -11,11 +11,11 @@ import ( cid "github.com/ipfs/go-cid" assert "github.com/stretchr/testify/assert" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - init_ "github.com/filecoin-project/specs-actors/v6/actors/builtin/init" - "github.com/filecoin-project/specs-actors/v6/actors/util/adt" - "github.com/filecoin-project/specs-actors/v6/support/mock" - tutil "github.com/filecoin-project/specs-actors/v6/support/testing" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + init_ "github.com/filecoin-project/specs-actors/v7/actors/builtin/init" + "github.com/filecoin-project/specs-actors/v7/actors/util/adt" + "github.com/filecoin-project/specs-actors/v7/support/mock" + tutil "github.com/filecoin-project/specs-actors/v7/support/testing" ) func TestExports(t *testing.T) { diff --git a/actors/builtin/init/testing.go b/actors/builtin/init/testing.go index 4d59f5c2b..c511e3b3a 100644 --- a/actors/builtin/init/testing.go +++ b/actors/builtin/init/testing.go @@ -5,8 +5,8 @@ import ( "github.com/filecoin-project/go-state-types/abi" cbg "github.com/whyrusleeping/cbor-gen" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/util/adt" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/util/adt" ) type StateSummary struct { diff --git a/actors/builtin/market/market_actor.go b/actors/builtin/market/market_actor.go index 7567f7b67..afd97a169 100644 --- a/actors/builtin/market/market_actor.go +++ b/actors/builtin/market/market_actor.go @@ -15,12 +15,12 @@ import ( cbg "github.com/whyrusleeping/cbor-gen" "golang.org/x/xerrors" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/power" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/reward" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/verifreg" - "github.com/filecoin-project/specs-actors/v6/actors/runtime" - "github.com/filecoin-project/specs-actors/v6/actors/util/adt" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/power" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/reward" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/verifreg" + "github.com/filecoin-project/specs-actors/v7/actors/runtime" + "github.com/filecoin-project/specs-actors/v7/actors/util/adt" ) type Actor struct{} diff --git a/actors/builtin/market/market_state.go b/actors/builtin/market/market_state.go index f42b1a87f..6606b47ad 100644 --- a/actors/builtin/market/market_state.go +++ b/actors/builtin/market/market_state.go @@ -9,8 +9,8 @@ import ( "github.com/ipfs/go-cid" xerrors "golang.org/x/xerrors" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/util/adt" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/util/adt" ) const epochUndefined = abi.ChainEpoch(-1) diff --git a/actors/builtin/market/market_test.go b/actors/builtin/market/market_test.go index 9dd5a4744..69b538bca 100644 --- a/actors/builtin/market/market_test.go +++ b/actors/builtin/market/market_test.go @@ -16,15 +16,15 @@ import ( "github.com/filecoin-project/go-state-types/exitcode" cid "github.com/ipfs/go-cid" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/market" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/miner" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/power" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/reward" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/verifreg" - "github.com/filecoin-project/specs-actors/v6/actors/util/adt" - "github.com/filecoin-project/specs-actors/v6/support/mock" - tutil "github.com/filecoin-project/specs-actors/v6/support/testing" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/market" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/miner" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/power" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/reward" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/verifreg" + "github.com/filecoin-project/specs-actors/v7/actors/util/adt" + "github.com/filecoin-project/specs-actors/v7/support/mock" + tutil "github.com/filecoin-project/specs-actors/v7/support/testing" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/actors/builtin/market/policy.go b/actors/builtin/market/policy.go index 7da97f454..1f03a57a2 100644 --- a/actors/builtin/market/policy.go +++ b/actors/builtin/market/policy.go @@ -4,7 +4,7 @@ import ( "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" ) // The number of epochs between payment and other state processing for deals. diff --git a/actors/builtin/market/set_multimap.go b/actors/builtin/market/set_multimap.go index 8189a6b7b..244861090 100644 --- a/actors/builtin/market/set_multimap.go +++ b/actors/builtin/market/set_multimap.go @@ -8,7 +8,7 @@ import ( cbg "github.com/whyrusleeping/cbor-gen" "golang.org/x/xerrors" - "github.com/filecoin-project/specs-actors/v6/actors/util/adt" + "github.com/filecoin-project/specs-actors/v7/actors/util/adt" ) type SetMultimap struct { diff --git a/actors/builtin/market/testing.go b/actors/builtin/market/testing.go index f3da01a1e..798c846db 100644 --- a/actors/builtin/market/testing.go +++ b/actors/builtin/market/testing.go @@ -12,8 +12,8 @@ import ( "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/util/adt" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/util/adt" ) type DealSummary struct { diff --git a/actors/builtin/market/types.go b/actors/builtin/market/types.go index ce104cbc6..655fc2808 100644 --- a/actors/builtin/market/types.go +++ b/actors/builtin/market/types.go @@ -2,7 +2,7 @@ package market import ( "github.com/filecoin-project/go-state-types/abi" - . "github.com/filecoin-project/specs-actors/v6/actors/util/adt" + . "github.com/filecoin-project/specs-actors/v7/actors/util/adt" "github.com/ipfs/go-cid" ) diff --git a/actors/builtin/miner/bitfield_queue.go b/actors/builtin/miner/bitfield_queue.go index 82c36f170..00550e3f1 100644 --- a/actors/builtin/miner/bitfield_queue.go +++ b/actors/builtin/miner/bitfield_queue.go @@ -9,8 +9,8 @@ import ( "github.com/ipfs/go-cid" "golang.org/x/xerrors" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/util/adt" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/util/adt" ) // Wrapper for working with an AMT[ChainEpoch]*Bitfield functioning as a queue, bucketed by epoch. diff --git a/actors/builtin/miner/bitfield_queue_test.go b/actors/builtin/miner/bitfield_queue_test.go index fd824b6c6..e6fac10a0 100644 --- a/actors/builtin/miner/bitfield_queue_test.go +++ b/actors/builtin/miner/bitfield_queue_test.go @@ -9,10 +9,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/miner" - "github.com/filecoin-project/specs-actors/v6/actors/util/adt" - "github.com/filecoin-project/specs-actors/v6/support/mock" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/miner" + "github.com/filecoin-project/specs-actors/v7/actors/util/adt" + "github.com/filecoin-project/specs-actors/v7/support/mock" ) const testAmtBitwidth = 3 diff --git a/actors/builtin/miner/deadline_state.go b/actors/builtin/miner/deadline_state.go index 543b7ba83..d95091e75 100644 --- a/actors/builtin/miner/deadline_state.go +++ b/actors/builtin/miner/deadline_state.go @@ -12,9 +12,9 @@ import ( cbg "github.com/whyrusleeping/cbor-gen" "golang.org/x/xerrors" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/runtime/proof" - "github.com/filecoin-project/specs-actors/v6/actors/util/adt" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/runtime/proof" + "github.com/filecoin-project/specs-actors/v7/actors/util/adt" ) // Deadlines contains Deadline objects, describing the sectors due at the given diff --git a/actors/builtin/miner/deadline_state_test.go b/actors/builtin/miner/deadline_state_test.go index 5267854f8..d5aa3925f 100644 --- a/actors/builtin/miner/deadline_state_test.go +++ b/actors/builtin/miner/deadline_state_test.go @@ -10,10 +10,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/miner" - "github.com/filecoin-project/specs-actors/v6/actors/util/adt" - "github.com/filecoin-project/specs-actors/v6/support/ipld" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/miner" + "github.com/filecoin-project/specs-actors/v7/actors/util/adt" + "github.com/filecoin-project/specs-actors/v7/support/ipld" ) func TestDeadlines(t *testing.T) { diff --git a/actors/builtin/miner/deadlines.go b/actors/builtin/miner/deadlines.go index 9d189a24b..644039560 100644 --- a/actors/builtin/miner/deadlines.go +++ b/actors/builtin/miner/deadlines.go @@ -7,8 +7,8 @@ import ( "github.com/filecoin-project/go-state-types/dline" "golang.org/x/xerrors" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/util/adt" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/util/adt" ) // Returns deadline-related calculations for a deadline in some proving period and the current epoch. diff --git a/actors/builtin/miner/deadlines_test.go b/actors/builtin/miner/deadlines_test.go index a70793a61..7ac54ecc9 100644 --- a/actors/builtin/miner/deadlines_test.go +++ b/actors/builtin/miner/deadlines_test.go @@ -6,7 +6,7 @@ import ( "github.com/filecoin-project/go-state-types/abi" "github.com/stretchr/testify/assert" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/miner" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/miner" ) func TestProvingPeriodDeadlines(t *testing.T) { diff --git a/actors/builtin/miner/expiration_queue.go b/actors/builtin/miner/expiration_queue.go index 1617729f6..0f809e33e 100644 --- a/actors/builtin/miner/expiration_queue.go +++ b/actors/builtin/miner/expiration_queue.go @@ -10,9 +10,9 @@ import ( "github.com/ipfs/go-cid" "golang.org/x/xerrors" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/util" - "github.com/filecoin-project/specs-actors/v6/actors/util/adt" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/util" + "github.com/filecoin-project/specs-actors/v7/actors/util/adt" ) // ExpirationSet is a collection of sector numbers that are expiring, either due to diff --git a/actors/builtin/miner/expiration_queue_internal_test.go b/actors/builtin/miner/expiration_queue_internal_test.go index 4d5ab89c5..96374fcd1 100644 --- a/actors/builtin/miner/expiration_queue_internal_test.go +++ b/actors/builtin/miner/expiration_queue_internal_test.go @@ -5,7 +5,7 @@ import ( "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/actors/builtin/miner/expiration_queue_test.go b/actors/builtin/miner/expiration_queue_test.go index 3ed90308a..634eccba0 100644 --- a/actors/builtin/miner/expiration_queue_test.go +++ b/actors/builtin/miner/expiration_queue_test.go @@ -11,11 +11,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/miner" - "github.com/filecoin-project/specs-actors/v6/actors/util/adt" - "github.com/filecoin-project/specs-actors/v6/support/mock" - tutil "github.com/filecoin-project/specs-actors/v6/support/testing" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/miner" + "github.com/filecoin-project/specs-actors/v7/actors/util/adt" + "github.com/filecoin-project/specs-actors/v7/support/mock" + tutil "github.com/filecoin-project/specs-actors/v7/support/testing" ) func TestExpirationSet(t *testing.T) { diff --git a/actors/builtin/miner/miner_actor.go b/actors/builtin/miner/miner_actor.go index 8ba7a35a2..dc519adea 100644 --- a/actors/builtin/miner/miner_actor.go +++ b/actors/builtin/miner/miner_actor.go @@ -22,15 +22,15 @@ import ( cbg "github.com/whyrusleeping/cbor-gen" "golang.org/x/xerrors" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/market" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/power" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/reward" - "github.com/filecoin-project/specs-actors/v6/actors/runtime" - "github.com/filecoin-project/specs-actors/v6/actors/runtime/proof" - . "github.com/filecoin-project/specs-actors/v6/actors/util" - "github.com/filecoin-project/specs-actors/v6/actors/util/adt" - "github.com/filecoin-project/specs-actors/v6/actors/util/smoothing" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/market" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/power" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/reward" + "github.com/filecoin-project/specs-actors/v7/actors/runtime" + "github.com/filecoin-project/specs-actors/v7/actors/runtime/proof" + . "github.com/filecoin-project/specs-actors/v7/actors/util" + "github.com/filecoin-project/specs-actors/v7/actors/util/adt" + "github.com/filecoin-project/specs-actors/v7/actors/util/smoothing" ) type Runtime = runtime.Runtime @@ -2137,7 +2137,7 @@ func (a Actor) OnDeferredCronEvent(rt Runtime, params *builtin.DeferredCronEvent // TODO: We're using the current power+epoch reward. Technically, we // should use the power/reward at the time of termination. -// https://github.com/filecoin-project/specs-actors/v6/pull/648 +// https://github.com/filecoin-project/specs-actors/v7/pull/648 func processEarlyTerminations(rt Runtime, rewardSmoothed smoothing.FilterEstimate, qualityAdjPowerSmoothed smoothing.FilterEstimate) (more bool) { store := adt.AsStore(rt) diff --git a/actors/builtin/miner/miner_commitment_test.go b/actors/builtin/miner/miner_commitment_test.go index b5d283829..00b15c062 100644 --- a/actors/builtin/miner/miner_commitment_test.go +++ b/actors/builtin/miner/miner_commitment_test.go @@ -11,13 +11,13 @@ import ( "github.com/filecoin-project/go-state-types/exitcode" "github.com/filecoin-project/go-state-types/network" miner0 "github.com/filecoin-project/specs-actors/actors/builtin/miner" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/market" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/miner" - "github.com/filecoin-project/specs-actors/v6/actors/runtime" - "github.com/filecoin-project/specs-actors/v6/actors/util/smoothing" - "github.com/filecoin-project/specs-actors/v6/support/mock" - tutil "github.com/filecoin-project/specs-actors/v6/support/testing" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/market" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/miner" + "github.com/filecoin-project/specs-actors/v7/actors/runtime" + "github.com/filecoin-project/specs-actors/v7/actors/util/smoothing" + "github.com/filecoin-project/specs-actors/v7/support/mock" + tutil "github.com/filecoin-project/specs-actors/v7/support/testing" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/actors/builtin/miner/miner_internal_test.go b/actors/builtin/miner/miner_internal_test.go index bdbf592c5..34054e656 100644 --- a/actors/builtin/miner/miner_internal_test.go +++ b/actors/builtin/miner/miner_internal_test.go @@ -8,9 +8,9 @@ import ( "github.com/minio/blake2b-simd" "github.com/stretchr/testify/assert" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/util/smoothing" - tutils "github.com/filecoin-project/specs-actors/v6/support/testing" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/util/smoothing" + tutils "github.com/filecoin-project/specs-actors/v7/support/testing" ) func TestAssignProvingPeriodBoundary(t *testing.T) { diff --git a/actors/builtin/miner/miner_state.go b/actors/builtin/miner/miner_state.go index 385c047a5..21bcea582 100644 --- a/actors/builtin/miner/miner_state.go +++ b/actors/builtin/miner/miner_state.go @@ -14,8 +14,8 @@ import ( cid "github.com/ipfs/go-cid" xerrors "golang.org/x/xerrors" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/util/adt" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/util/adt" ) // Balance of Miner Actor should be greater than or equal to diff --git a/actors/builtin/miner/miner_state_test.go b/actors/builtin/miner/miner_state_test.go index 03c4a0d5f..2407e3f1e 100644 --- a/actors/builtin/miner/miner_state_test.go +++ b/actors/builtin/miner/miner_state_test.go @@ -14,11 +14,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/miner" - "github.com/filecoin-project/specs-actors/v6/actors/util/adt" - "github.com/filecoin-project/specs-actors/v6/support/ipld" - tutils "github.com/filecoin-project/specs-actors/v6/support/testing" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/miner" + "github.com/filecoin-project/specs-actors/v7/actors/util/adt" + "github.com/filecoin-project/specs-actors/v7/support/ipld" + tutils "github.com/filecoin-project/specs-actors/v7/support/testing" ) func TestPrecommittedSectorsStore(t *testing.T) { diff --git a/actors/builtin/miner/miner_test.go b/actors/builtin/miner/miner_test.go index 6c129f8eb..639e546dd 100644 --- a/actors/builtin/miner/miner_test.go +++ b/actors/builtin/miner/miner_test.go @@ -21,17 +21,17 @@ import ( "github.com/stretchr/testify/require" cbg "github.com/whyrusleeping/cbor-gen" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/market" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/miner" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/power" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/reward" - "github.com/filecoin-project/specs-actors/v6/actors/runtime" - "github.com/filecoin-project/specs-actors/v6/actors/runtime/proof" - "github.com/filecoin-project/specs-actors/v6/actors/util/adt" - "github.com/filecoin-project/specs-actors/v6/actors/util/smoothing" - "github.com/filecoin-project/specs-actors/v6/support/mock" - tutil "github.com/filecoin-project/specs-actors/v6/support/testing" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/market" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/miner" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/power" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/reward" + "github.com/filecoin-project/specs-actors/v7/actors/runtime" + "github.com/filecoin-project/specs-actors/v7/actors/runtime/proof" + "github.com/filecoin-project/specs-actors/v7/actors/util/adt" + "github.com/filecoin-project/specs-actors/v7/actors/util/smoothing" + "github.com/filecoin-project/specs-actors/v7/support/mock" + tutil "github.com/filecoin-project/specs-actors/v7/support/testing" ) var testPid abi.PeerID diff --git a/actors/builtin/miner/monies.go b/actors/builtin/miner/monies.go index ddd748763..bed3fb7db 100644 --- a/actors/builtin/miner/monies.go +++ b/actors/builtin/miner/monies.go @@ -6,9 +6,9 @@ import ( "github.com/filecoin-project/go-state-types/exitcode" rtt "github.com/filecoin-project/go-state-types/rt" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/util/math" - "github.com/filecoin-project/specs-actors/v6/actors/util/smoothing" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/util/math" + "github.com/filecoin-project/specs-actors/v7/actors/util/smoothing" ) // Projection period of expected sector block reward for deposit required to pre-commit a sector. diff --git a/actors/builtin/miner/monies_test.go b/actors/builtin/miner/monies_test.go index 268624a3f..ff42b6c7b 100644 --- a/actors/builtin/miner/monies_test.go +++ b/actors/builtin/miner/monies_test.go @@ -7,9 +7,9 @@ import ( "github.com/filecoin-project/go-state-types/big" "github.com/stretchr/testify/assert" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/miner" - "github.com/filecoin-project/specs-actors/v6/actors/util/smoothing" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/miner" + "github.com/filecoin-project/specs-actors/v7/actors/util/smoothing" ) // Test termination fee diff --git a/actors/builtin/miner/partition_state.go b/actors/builtin/miner/partition_state.go index e029c6263..f0c816664 100644 --- a/actors/builtin/miner/partition_state.go +++ b/actors/builtin/miner/partition_state.go @@ -10,9 +10,9 @@ import ( "github.com/ipfs/go-cid" "golang.org/x/xerrors" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/util" - "github.com/filecoin-project/specs-actors/v6/actors/util/adt" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/util" + "github.com/filecoin-project/specs-actors/v7/actors/util/adt" ) type Partition struct { diff --git a/actors/builtin/miner/partition_state_test.go b/actors/builtin/miner/partition_state_test.go index 465f2600d..7e4f19142 100644 --- a/actors/builtin/miner/partition_state_test.go +++ b/actors/builtin/miner/partition_state_test.go @@ -14,10 +14,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/miner" - "github.com/filecoin-project/specs-actors/v6/actors/util/adt" - "github.com/filecoin-project/specs-actors/v6/support/ipld" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/miner" + "github.com/filecoin-project/specs-actors/v7/actors/util/adt" + "github.com/filecoin-project/specs-actors/v7/support/ipld" ) func TestPartitions(t *testing.T) { diff --git a/actors/builtin/miner/policy.go b/actors/builtin/miner/policy.go index 4032362b2..965ac7a3d 100644 --- a/actors/builtin/miner/policy.go +++ b/actors/builtin/miner/policy.go @@ -8,7 +8,7 @@ import ( "github.com/ipfs/go-cid" mh "github.com/multiformats/go-multihash" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" ) // The period over which a miner's active sectors are expected to be proven via WindowPoSt. diff --git a/actors/builtin/miner/policy_test.go b/actors/builtin/miner/policy_test.go index 7568ed212..c46fa5a4a 100644 --- a/actors/builtin/miner/policy_test.go +++ b/actors/builtin/miner/policy_test.go @@ -7,8 +7,8 @@ import ( "github.com/filecoin-project/go-state-types/big" "github.com/stretchr/testify/assert" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/miner" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/miner" ) func TestQuality(t *testing.T) { diff --git a/actors/builtin/miner/sector_map_test.go b/actors/builtin/miner/sector_map_test.go index 8c420d560..09f0cb0de 100644 --- a/actors/builtin/miner/sector_map_test.go +++ b/actors/builtin/miner/sector_map_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/miner" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/miner" ) func TestDeadlineSectorMap(t *testing.T) { diff --git a/actors/builtin/miner/sectors.go b/actors/builtin/miner/sectors.go index 4a2897c02..7f24a0a07 100644 --- a/actors/builtin/miner/sectors.go +++ b/actors/builtin/miner/sectors.go @@ -9,7 +9,7 @@ import ( "github.com/ipfs/go-cid" "golang.org/x/xerrors" - "github.com/filecoin-project/specs-actors/v6/actors/util/adt" + "github.com/filecoin-project/specs-actors/v7/actors/util/adt" ) func LoadSectors(store adt.Store, root cid.Cid) (Sectors, error) { diff --git a/actors/builtin/miner/sectors_test.go b/actors/builtin/miner/sectors_test.go index 7a092dad5..50fc80fa5 100644 --- a/actors/builtin/miner/sectors_test.go +++ b/actors/builtin/miner/sectors_test.go @@ -9,10 +9,10 @@ import ( "github.com/filecoin-project/go-state-types/big" "github.com/stretchr/testify/require" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/miner" - "github.com/filecoin-project/specs-actors/v6/actors/util/adt" - "github.com/filecoin-project/specs-actors/v6/support/ipld" - tutil "github.com/filecoin-project/specs-actors/v6/support/testing" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/miner" + "github.com/filecoin-project/specs-actors/v7/actors/util/adt" + "github.com/filecoin-project/specs-actors/v7/support/ipld" + tutil "github.com/filecoin-project/specs-actors/v7/support/testing" ) func sectorsArr(t *testing.T, store adt.Store, sectors []*miner.SectorOnChainInfo) miner.Sectors { diff --git a/actors/builtin/miner/termination_test.go b/actors/builtin/miner/termination_test.go index be464619a..bec2abe43 100644 --- a/actors/builtin/miner/termination_test.go +++ b/actors/builtin/miner/termination_test.go @@ -7,7 +7,7 @@ import ( "github.com/filecoin-project/go-state-types/abi" "github.com/stretchr/testify/require" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/miner" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/miner" ) func TestTerminationResult(t *testing.T) { diff --git a/actors/builtin/miner/testing.go b/actors/builtin/miner/testing.go index 1b759e2dd..c7feddc05 100644 --- a/actors/builtin/miner/testing.go +++ b/actors/builtin/miner/testing.go @@ -6,9 +6,9 @@ import ( "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/util" - "github.com/filecoin-project/specs-actors/v6/actors/util/adt" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/util" + "github.com/filecoin-project/specs-actors/v7/actors/util/adt" ) type DealSummary struct { diff --git a/actors/builtin/miner/vesting_state.go b/actors/builtin/miner/vesting_state.go index 6b5d7d59b..62f6c1570 100644 --- a/actors/builtin/miner/vesting_state.go +++ b/actors/builtin/miner/vesting_state.go @@ -3,7 +3,7 @@ package miner import ( "sort" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" diff --git a/actors/builtin/multisig/multisig_actor.go b/actors/builtin/multisig/multisig_actor.go index 5fa0b1b29..da66c1d48 100644 --- a/actors/builtin/multisig/multisig_actor.go +++ b/actors/builtin/multisig/multisig_actor.go @@ -14,9 +14,9 @@ import ( "github.com/ipfs/go-cid" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/runtime" - "github.com/filecoin-project/specs-actors/v6/actors/util/adt" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/runtime" + "github.com/filecoin-project/specs-actors/v7/actors/util/adt" ) type TxnID = multisig0.TxnID diff --git a/actors/builtin/multisig/multisig_state.go b/actors/builtin/multisig/multisig_state.go index 8ce4632a8..8659e0cba 100644 --- a/actors/builtin/multisig/multisig_state.go +++ b/actors/builtin/multisig/multisig_state.go @@ -7,8 +7,8 @@ import ( cid "github.com/ipfs/go-cid" "golang.org/x/xerrors" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/util/adt" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/util/adt" ) type State struct { diff --git a/actors/builtin/multisig/multisig_test.go b/actors/builtin/multisig/multisig_test.go index f4bf9a7b3..bfe8c34c7 100644 --- a/actors/builtin/multisig/multisig_test.go +++ b/actors/builtin/multisig/multisig_test.go @@ -14,12 +14,12 @@ import ( assert "github.com/stretchr/testify/assert" require "github.com/stretchr/testify/require" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/miner" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/multisig" - "github.com/filecoin-project/specs-actors/v6/actors/util/adt" - "github.com/filecoin-project/specs-actors/v6/support/mock" - tutil "github.com/filecoin-project/specs-actors/v6/support/testing" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/miner" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/multisig" + "github.com/filecoin-project/specs-actors/v7/actors/util/adt" + "github.com/filecoin-project/specs-actors/v7/support/mock" + tutil "github.com/filecoin-project/specs-actors/v7/support/testing" ) func TestExports(t *testing.T) { diff --git a/actors/builtin/multisig/testing.go b/actors/builtin/multisig/testing.go index 5e0b58d05..d24d55df4 100644 --- a/actors/builtin/multisig/testing.go +++ b/actors/builtin/multisig/testing.go @@ -4,8 +4,8 @@ import ( "bytes" "encoding/binary" "github.com/filecoin-project/go-address" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/util/adt" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/util/adt" ) type StateSummary struct { diff --git a/actors/builtin/paych/paych_actor.go b/actors/builtin/paych/paych_actor.go index 7e2a2e837..b552c97f9 100644 --- a/actors/builtin/paych/paych_actor.go +++ b/actors/builtin/paych/paych_actor.go @@ -13,9 +13,9 @@ import ( "github.com/ipfs/go-cid" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/runtime" - "github.com/filecoin-project/specs-actors/v6/actors/util/adt" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/runtime" + "github.com/filecoin-project/specs-actors/v7/actors/util/adt" ) const ( diff --git a/actors/builtin/paych/paych_test.go b/actors/builtin/paych/paych_test.go index 7dad22423..966e1c328 100644 --- a/actors/builtin/paych/paych_test.go +++ b/actors/builtin/paych/paych_test.go @@ -17,11 +17,11 @@ import ( "github.com/stretchr/testify/require" cbg "github.com/whyrusleeping/cbor-gen" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - . "github.com/filecoin-project/specs-actors/v6/actors/builtin/paych" - "github.com/filecoin-project/specs-actors/v6/actors/util/adt" - "github.com/filecoin-project/specs-actors/v6/support/mock" - tutil "github.com/filecoin-project/specs-actors/v6/support/testing" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + . "github.com/filecoin-project/specs-actors/v7/actors/builtin/paych" + "github.com/filecoin-project/specs-actors/v7/actors/util/adt" + "github.com/filecoin-project/specs-actors/v7/support/mock" + tutil "github.com/filecoin-project/specs-actors/v7/support/testing" ) func TestExports(t *testing.T) { diff --git a/actors/builtin/paych/policy.go b/actors/builtin/paych/policy.go index 0ea0919da..b78257ebd 100644 --- a/actors/builtin/paych/policy.go +++ b/actors/builtin/paych/policy.go @@ -3,7 +3,7 @@ package paych import ( "math" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" ) // Maximum number of lanes in a channel. diff --git a/actors/builtin/paych/testing.go b/actors/builtin/paych/testing.go index 7587f4bd3..0cc1a87c4 100644 --- a/actors/builtin/paych/testing.go +++ b/actors/builtin/paych/testing.go @@ -4,8 +4,8 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/util/adt" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/util/adt" ) type StateSummary struct { diff --git a/actors/builtin/power/power_actor.go b/actors/builtin/power/power_actor.go index a2f995c0b..7f4e6a57e 100644 --- a/actors/builtin/power/power_actor.go +++ b/actors/builtin/power/power_actor.go @@ -14,13 +14,13 @@ import ( power0 "github.com/filecoin-project/specs-actors/actors/builtin/power" "github.com/ipfs/go-cid" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - initact "github.com/filecoin-project/specs-actors/v6/actors/builtin/init" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/reward" - "github.com/filecoin-project/specs-actors/v6/actors/runtime" - "github.com/filecoin-project/specs-actors/v6/actors/runtime/proof" - "github.com/filecoin-project/specs-actors/v6/actors/util/adt" - "github.com/filecoin-project/specs-actors/v6/actors/util/smoothing" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + initact "github.com/filecoin-project/specs-actors/v7/actors/builtin/init" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/reward" + "github.com/filecoin-project/specs-actors/v7/actors/runtime" + "github.com/filecoin-project/specs-actors/v7/actors/runtime/proof" + "github.com/filecoin-project/specs-actors/v7/actors/util/adt" + "github.com/filecoin-project/specs-actors/v7/actors/util/smoothing" ) type Runtime = runtime.Runtime diff --git a/actors/builtin/power/power_state.go b/actors/builtin/power/power_state.go index da6b27dbc..658e627a8 100644 --- a/actors/builtin/power/power_state.go +++ b/actors/builtin/power/power_state.go @@ -11,9 +11,9 @@ import ( cid "github.com/ipfs/go-cid" "golang.org/x/xerrors" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/util/adt" - "github.com/filecoin-project/specs-actors/v6/actors/util/smoothing" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/util/adt" + "github.com/filecoin-project/specs-actors/v7/actors/util/smoothing" ) // genesis power in bytes = 750,000 GiB diff --git a/actors/builtin/power/power_test.go b/actors/builtin/power/power_test.go index eb89d818f..d33ef16d9 100644 --- a/actors/builtin/power/power_test.go +++ b/actors/builtin/power/power_test.go @@ -15,17 +15,17 @@ import ( assert "github.com/stretchr/testify/assert" require "github.com/stretchr/testify/require" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - initact "github.com/filecoin-project/specs-actors/v6/actors/builtin/init" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/market" - mineract "github.com/filecoin-project/specs-actors/v6/actors/builtin/miner" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/power" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/reward" - "github.com/filecoin-project/specs-actors/v6/actors/runtime/proof" - "github.com/filecoin-project/specs-actors/v6/actors/util/adt" - "github.com/filecoin-project/specs-actors/v6/actors/util/smoothing" - "github.com/filecoin-project/specs-actors/v6/support/mock" - tutil "github.com/filecoin-project/specs-actors/v6/support/testing" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + initact "github.com/filecoin-project/specs-actors/v7/actors/builtin/init" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/market" + mineract "github.com/filecoin-project/specs-actors/v7/actors/builtin/miner" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/power" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/reward" + "github.com/filecoin-project/specs-actors/v7/actors/runtime/proof" + "github.com/filecoin-project/specs-actors/v7/actors/util/adt" + "github.com/filecoin-project/specs-actors/v7/actors/util/smoothing" + "github.com/filecoin-project/specs-actors/v7/support/mock" + tutil "github.com/filecoin-project/specs-actors/v7/support/testing" ) func TestExports(t *testing.T) { diff --git a/actors/builtin/power/testing.go b/actors/builtin/power/testing.go index dd11c4b60..d72eb6a90 100644 --- a/actors/builtin/power/testing.go +++ b/actors/builtin/power/testing.go @@ -5,9 +5,9 @@ import ( "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/runtime/proof" - "github.com/filecoin-project/specs-actors/v6/actors/util/adt" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/runtime/proof" + "github.com/filecoin-project/specs-actors/v7/actors/util/adt" ) type MinerCronEvent struct { diff --git a/actors/builtin/quantize_test.go b/actors/builtin/quantize_test.go index d5598daa0..5f72d0c05 100644 --- a/actors/builtin/quantize_test.go +++ b/actors/builtin/quantize_test.go @@ -3,7 +3,7 @@ package builtin_test import ( "testing" - . "github.com/filecoin-project/specs-actors/v6/actors/builtin" + . "github.com/filecoin-project/specs-actors/v7/actors/builtin" "github.com/filecoin-project/go-state-types/abi" "github.com/stretchr/testify/assert" diff --git a/actors/builtin/reward/reward_actor.go b/actors/builtin/reward/reward_actor.go index 55333be77..bc1e4cfc9 100644 --- a/actors/builtin/reward/reward_actor.go +++ b/actors/builtin/reward/reward_actor.go @@ -9,9 +9,9 @@ import ( reward0 "github.com/filecoin-project/specs-actors/actors/builtin/reward" "github.com/ipfs/go-cid" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/runtime" - "github.com/filecoin-project/specs-actors/v6/actors/util/smoothing" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/runtime" + "github.com/filecoin-project/specs-actors/v7/actors/util/smoothing" ) // PenaltyMultiplier is the factor miner penaltys are scaled up by diff --git a/actors/builtin/reward/reward_logic.go b/actors/builtin/reward/reward_logic.go index 73a7275c7..571b0f51c 100644 --- a/actors/builtin/reward/reward_logic.go +++ b/actors/builtin/reward/reward_logic.go @@ -4,7 +4,7 @@ import ( "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/specs-actors/v6/actors/util/math" + "github.com/filecoin-project/specs-actors/v7/actors/util/math" ) // Baseline function = BaselineInitialValue * (BaselineExponent) ^(t), t in epochs diff --git a/actors/builtin/reward/reward_logic_test.go b/actors/builtin/reward/reward_logic_test.go index 8a3aca5ba..66b656507 100644 --- a/actors/builtin/reward/reward_logic_test.go +++ b/actors/builtin/reward/reward_logic_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/xorcare/golden" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/util/math" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/util/math" ) func q128ToF(x big.Int) float64 { diff --git a/actors/builtin/reward/reward_state.go b/actors/builtin/reward/reward_state.go index b395a44d4..1a2cbb69d 100644 --- a/actors/builtin/reward/reward_state.go +++ b/actors/builtin/reward/reward_state.go @@ -4,7 +4,7 @@ import ( "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/specs-actors/v6/actors/util/smoothing" + "github.com/filecoin-project/specs-actors/v7/actors/util/smoothing" ) // A quantity of space * time (in byte-epochs) representing power committed to the network for some duration. diff --git a/actors/builtin/reward/reward_test.go b/actors/builtin/reward/reward_test.go index 0532399bb..d7ecb057d 100644 --- a/actors/builtin/reward/reward_test.go +++ b/actors/builtin/reward/reward_test.go @@ -10,10 +10,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/reward" - "github.com/filecoin-project/specs-actors/v6/support/mock" - tutil "github.com/filecoin-project/specs-actors/v6/support/testing" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/reward" + "github.com/filecoin-project/specs-actors/v7/support/mock" + tutil "github.com/filecoin-project/specs-actors/v7/support/testing" ) func TestExports(t *testing.T) { diff --git a/actors/builtin/reward/testing.go b/actors/builtin/reward/testing.go index 7b8591cc9..93880a0c7 100644 --- a/actors/builtin/reward/testing.go +++ b/actors/builtin/reward/testing.go @@ -3,8 +3,8 @@ package reward import ( "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/util/adt" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/util/adt" ) type StateSummary struct{} diff --git a/actors/builtin/shared.go b/actors/builtin/shared.go index ddad80d1a..c90135146 100644 --- a/actors/builtin/shared.go +++ b/actors/builtin/shared.go @@ -11,8 +11,8 @@ import ( "github.com/filecoin-project/go-state-types/exitcode" builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/runtime" - "github.com/filecoin-project/specs-actors/v6/actors/util/smoothing" + "github.com/filecoin-project/specs-actors/v7/actors/runtime" + "github.com/filecoin-project/specs-actors/v7/actors/util/smoothing" ) ///// Code shared by multiple built-in actors. ///// diff --git a/actors/builtin/system/system_actor.go b/actors/builtin/system/system_actor.go index 221161f42..7460ecc67 100644 --- a/actors/builtin/system/system_actor.go +++ b/actors/builtin/system/system_actor.go @@ -5,8 +5,8 @@ import ( "github.com/filecoin-project/go-state-types/cbor" "github.com/ipfs/go-cid" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/runtime" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/runtime" ) type Actor struct{} diff --git a/actors/builtin/system/system_test.go b/actors/builtin/system/system_test.go index b0cdd27cb..3c43f6e3b 100644 --- a/actors/builtin/system/system_test.go +++ b/actors/builtin/system/system_test.go @@ -5,9 +5,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/system" - "github.com/filecoin-project/specs-actors/v6/support/mock" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/system" + "github.com/filecoin-project/specs-actors/v7/support/mock" ) func TestExports(t *testing.T) { diff --git a/actors/builtin/testing_test.go b/actors/builtin/testing_test.go index 38e1d1cb6..77f9843f7 100644 --- a/actors/builtin/testing_test.go +++ b/actors/builtin/testing_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" ) func TestMessageAccumulator(t *testing.T) { diff --git a/actors/builtin/verifreg/testing.go b/actors/builtin/verifreg/testing.go index c01cde76d..40eef73ad 100644 --- a/actors/builtin/verifreg/testing.go +++ b/actors/builtin/verifreg/testing.go @@ -5,8 +5,8 @@ import ( "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/util/adt" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/util/adt" ) type StateSummary struct { @@ -38,7 +38,6 @@ func CheckStateInvariants(st *State, store adt.Store) (*StateSummary, *builtin.M acc.RequireNoError(err, "error iterating verifiers") } - // Check clients allClients := map[addr.Address]DataCap{} if clients, err := adt.AsMap(store, st.VerifiedClients, builtin.DefaultHamtBitwidth); err != nil { diff --git a/actors/builtin/verifreg/verified_registry_actor.go b/actors/builtin/verifreg/verified_registry_actor.go index 72a2d867b..8f807d496 100644 --- a/actors/builtin/verifreg/verified_registry_actor.go +++ b/actors/builtin/verifreg/verified_registry_actor.go @@ -10,9 +10,9 @@ import ( "github.com/filecoin-project/go-state-types/exitcode" verifreg0 "github.com/filecoin-project/specs-actors/actors/builtin/verifreg" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/runtime" - "github.com/filecoin-project/specs-actors/v6/actors/util/adt" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/runtime" + "github.com/filecoin-project/specs-actors/v7/actors/util/adt" ) type Actor struct{} diff --git a/actors/builtin/verifreg/verified_registry_state.go b/actors/builtin/verifreg/verified_registry_state.go index f8bd9a80c..28b3d09b7 100644 --- a/actors/builtin/verifreg/verified_registry_state.go +++ b/actors/builtin/verifreg/verified_registry_state.go @@ -6,8 +6,8 @@ import ( cid "github.com/ipfs/go-cid" "golang.org/x/xerrors" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/util/adt" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/util/adt" ) // DataCap is an integer number of bytes. diff --git a/actors/builtin/verifreg/verified_registry_test.go b/actors/builtin/verifreg/verified_registry_test.go index 47c82fb67..241317986 100644 --- a/actors/builtin/verifreg/verified_registry_test.go +++ b/actors/builtin/verifreg/verified_registry_test.go @@ -11,11 +11,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/verifreg" - "github.com/filecoin-project/specs-actors/v6/actors/util/adt" - "github.com/filecoin-project/specs-actors/v6/support/mock" - tutil "github.com/filecoin-project/specs-actors/v6/support/testing" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/verifreg" + "github.com/filecoin-project/specs-actors/v7/actors/util/adt" + "github.com/filecoin-project/specs-actors/v7/support/mock" + tutil "github.com/filecoin-project/specs-actors/v7/support/testing" ) func TestExports(t *testing.T) { diff --git a/actors/migration/nv14/test/parallel_migration_test.go b/actors/migration/nv15/test/parallel_migration_test.go similarity index 59% rename from actors/migration/nv14/test/parallel_migration_test.go rename to actors/migration/nv15/test/parallel_migration_test.go index d0b400c1e..71828d6c1 100644 --- a/actors/migration/nv14/test/parallel_migration_test.go +++ b/actors/migration/nv15/test/parallel_migration_test.go @@ -4,11 +4,12 @@ import ( "context" "testing" + vmtest "github.com/filecoin-project/specs-actors/v7/support/vm" + "github.com/filecoin-project/go-state-types/abi" ipld2 "github.com/filecoin-project/specs-actors/v2/support/ipld" - vm5 "github.com/filecoin-project/specs-actors/v5/support/vm" - "github.com/filecoin-project/specs-actors/v6/actors/migration/nv14" - adt5 "github.com/filecoin-project/specs-actors/v6/actors/util/adt" + "github.com/filecoin-project/specs-actors/v7/actors/migration/nv15" + adt5 "github.com/filecoin-project/specs-actors/v7/actors/util/adt" cbor "github.com/ipfs/go-ipld-cbor" "github.com/ipfs/go-cid" @@ -20,14 +21,14 @@ import ( func TestParallelMigrationCalls(t *testing.T) { // Construct simple prior state tree over a synchronized store ctx := context.Background() - log := nv14.TestLogger{TB: t} + log := nv15.TestLogger{TB: t} bs := ipld2.NewSyncBlockStoreInMemory() - vm := vm5.NewVMWithSingletons(ctx, t, bs) + vm := vmtest.NewVMWithSingletons(ctx, t, bs) // Run migration adtStore := adt5.WrapStore(ctx, cbor.NewCborStore(bs)) startRoot := vm.StateRoot() - endRootSerial, err := nv14.MigrateStateTree(ctx, adtStore, startRoot, abi.ChainEpoch(0), nv14.Config{MaxWorkers: 1}, log, nv14.NewMemMigrationCache()) + endRootSerial, err := nv15.MigrateStateTree(ctx, adtStore, startRoot, abi.ChainEpoch(0), nv15.Config{MaxWorkers: 1}, log, nv15.NewMemMigrationCache()) require.NoError(t, err) // Migrate in parallel @@ -35,12 +36,12 @@ func TestParallelMigrationCalls(t *testing.T) { grp, ctx := errgroup.WithContext(ctx) grp.Go(func() error { var err1 error - endRootParallel1, err1 = nv14.MigrateStateTree(ctx, adtStore, startRoot, abi.ChainEpoch(0), nv14.Config{MaxWorkers: 2}, log, nv14.NewMemMigrationCache()) + endRootParallel1, err1 = nv15.MigrateStateTree(ctx, adtStore, startRoot, abi.ChainEpoch(0), nv15.Config{MaxWorkers: 2}, log, nv15.NewMemMigrationCache()) return err1 }) grp.Go(func() error { var err2 error - endRootParallel2, err2 = nv14.MigrateStateTree(ctx, adtStore, startRoot, abi.ChainEpoch(0), nv14.Config{MaxWorkers: 2}, log, nv14.NewMemMigrationCache()) + endRootParallel2, err2 = nv15.MigrateStateTree(ctx, adtStore, startRoot, abi.ChainEpoch(0), nv15.Config{MaxWorkers: 2}, log, nv15.NewMemMigrationCache()) return err2 }) require.NoError(t, grp.Wait()) diff --git a/actors/migration/nv14/top.go b/actors/migration/nv15/top.go similarity index 88% rename from actors/migration/nv14/top.go rename to actors/migration/nv15/top.go index 84f3dcc78..d0b523af8 100644 --- a/actors/migration/nv14/top.go +++ b/actors/migration/nv15/top.go @@ -1,4 +1,4 @@ -package nv14 +package nv15 import ( "context" @@ -10,11 +10,11 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/rt" - builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin" - states5 "github.com/filecoin-project/specs-actors/v5/actors/states" builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin" states6 "github.com/filecoin-project/specs-actors/v6/actors/states" - adt6 "github.com/filecoin-project/specs-actors/v6/actors/util/adt" + builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin" + states7 "github.com/filecoin-project/specs-actors/v7/actors/states" + adt7 "github.com/filecoin-project/specs-actors/v7/actors/util/adt" "github.com/ipfs/go-cid" cbor "github.com/ipfs/go-ipld-cbor" @@ -66,17 +66,17 @@ func MigrateStateTree(ctx context.Context, store cbor.IpldStore, actorsRootIn ci // Maps prior version code CIDs to migration functions. var migrations = map[cid.Cid]actorMigration{ - builtin5.AccountActorCodeID: nilMigrator{builtin6.AccountActorCodeID}, - builtin5.CronActorCodeID: nilMigrator{builtin6.CronActorCodeID}, - builtin5.InitActorCodeID: nilMigrator{builtin6.InitActorCodeID}, - builtin5.MultisigActorCodeID: nilMigrator{builtin6.MultisigActorCodeID}, - builtin5.PaymentChannelActorCodeID: nilMigrator{builtin6.PaymentChannelActorCodeID}, - builtin5.RewardActorCodeID: nilMigrator{builtin6.RewardActorCodeID}, - builtin5.StorageMarketActorCodeID: nilMigrator{builtin6.StorageMarketActorCodeID}, - builtin5.StorageMinerActorCodeID: nilMigrator{builtin6.StorageMinerActorCodeID}, - builtin5.StoragePowerActorCodeID: nilMigrator{builtin6.StoragePowerActorCodeID}, - builtin5.SystemActorCodeID: nilMigrator{builtin6.SystemActorCodeID}, - builtin5.VerifiedRegistryActorCodeID: nilMigrator{builtin6.VerifiedRegistryActorCodeID}, + builtin6.AccountActorCodeID: nilMigrator{builtin7.AccountActorCodeID}, + builtin6.CronActorCodeID: nilMigrator{builtin7.CronActorCodeID}, + builtin6.InitActorCodeID: nilMigrator{builtin7.InitActorCodeID}, + builtin6.MultisigActorCodeID: nilMigrator{builtin7.MultisigActorCodeID}, + builtin6.PaymentChannelActorCodeID: nilMigrator{builtin7.PaymentChannelActorCodeID}, + builtin6.RewardActorCodeID: nilMigrator{builtin7.RewardActorCodeID}, + builtin6.StorageMarketActorCodeID: nilMigrator{builtin7.StorageMarketActorCodeID}, + builtin6.StorageMinerActorCodeID: nilMigrator{builtin7.StorageMinerActorCodeID}, + builtin6.StoragePowerActorCodeID: nilMigrator{builtin7.StoragePowerActorCodeID}, + builtin6.SystemActorCodeID: nilMigrator{builtin7.SystemActorCodeID}, + builtin6.VerifiedRegistryActorCodeID: nilMigrator{builtin7.VerifiedRegistryActorCodeID}, } // Set of prior version code CIDs for actors to defer during iteration, for explicit migration afterwards. @@ -90,12 +90,12 @@ func MigrateStateTree(ctx context.Context, store cbor.IpldStore, actorsRootIn ci startTime := time.Now() // Load input and output state trees - adtStore := adt6.WrapStore(ctx, store) - actorsIn, err := states5.LoadTree(adtStore, actorsRootIn) + adtStore := adt7.WrapStore(ctx, store) + actorsIn, err := states6.LoadTree(adtStore, actorsRootIn) if err != nil { return cid.Undef, err } - actorsOut, err := states5.NewTree(adtStore) + actorsOut, err := states6.NewTree(adtStore) if err != nil { return cid.Undef, err } @@ -113,7 +113,7 @@ func MigrateStateTree(ctx context.Context, store cbor.IpldStore, actorsRootIn ci grp.Go(func() error { defer close(jobCh) log.Log(rt.INFO, "Creating migration jobs for tree %s", actorsRootIn) - if err = actorsIn.ForEach(func(addr address.Address, actorIn *states5.Actor) error { + if err = actorsIn.ForEach(func(addr address.Address, actorIn *states6.Actor) error { if _, ok := deferredCodeIDs[actorIn.Code]; ok { return nil // Deferred for explicit migration later. } @@ -246,14 +246,14 @@ type actorMigration interface { type migrationJob struct { address.Address - states5.Actor + states6.Actor actorMigration cache MigrationCache } type migrationJobResult struct { address.Address - states6.Actor + states7.Actor } func (job *migrationJob) run(ctx context.Context, store cbor.IpldStore, priorEpoch abi.ChainEpoch) (*migrationJobResult, error) { @@ -266,13 +266,13 @@ func (job *migrationJob) run(ctx context.Context, store cbor.IpldStore, priorEpo }) if err != nil { return nil, xerrors.Errorf("state migration failed for %s actor, addr %s: %w", - builtin5.ActorNameByCode(job.Actor.Code), job.Address, err) + builtin6.ActorNameByCode(job.Actor.Code), job.Address, err) } // Set up new actor record with the migrated state. return &migrationJobResult{ job.Address, // Unchanged - states6.Actor{ + states7.Actor{ Code: result.newCodeCID, Head: result.newHead, CallSeqNum: job.Actor.CallSeqNum, // Unchanged diff --git a/actors/migration/nv14/util.go b/actors/migration/nv15/util.go similarity index 99% rename from actors/migration/nv14/util.go rename to actors/migration/nv15/util.go index 8d0731c8a..e4cc412d2 100644 --- a/actors/migration/nv14/util.go +++ b/actors/migration/nv15/util.go @@ -1,4 +1,4 @@ -package nv14 +package nv15 import ( "sync" diff --git a/actors/runtime/runtime.go b/actors/runtime/runtime.go index 5bbc6321d..27a35e621 100644 --- a/actors/runtime/runtime.go +++ b/actors/runtime/runtime.go @@ -12,7 +12,7 @@ import ( "github.com/filecoin-project/go-state-types/rt" cid "github.com/ipfs/go-cid" - "github.com/filecoin-project/specs-actors/v6/actors/runtime/proof" + "github.com/filecoin-project/specs-actors/v7/actors/runtime/proof" ) // Interfaces for the runtime. diff --git a/actors/states/check.go b/actors/states/check.go index 255e38c38..f71bdfcda 100644 --- a/actors/states/check.go +++ b/actors/states/check.go @@ -8,18 +8,18 @@ import ( "github.com/filecoin-project/go-state-types/big" "golang.org/x/xerrors" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/power" - - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/account" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/cron" - init_ "github.com/filecoin-project/specs-actors/v6/actors/builtin/init" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/market" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/miner" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/multisig" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/paych" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/reward" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/verifreg" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/power" + + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/account" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/cron" + init_ "github.com/filecoin-project/specs-actors/v7/actors/builtin/init" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/market" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/miner" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/multisig" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/paych" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/reward" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/verifreg" ) // Within this code, Go errors are not expected, but are often converted to messages so that execution diff --git a/actors/states/election.go b/actors/states/election.go index c45490989..51f5866d7 100644 --- a/actors/states/election.go +++ b/actors/states/election.go @@ -5,9 +5,9 @@ import ( "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/miner" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/power" - "github.com/filecoin-project/specs-actors/v6/actors/util/adt" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/miner" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/power" + "github.com/filecoin-project/specs-actors/v7/actors/util/adt" ) // Checks for miner election eligibility. diff --git a/actors/states/election_test.go b/actors/states/election_test.go index ce5a157da..1806f952a 100644 --- a/actors/states/election_test.go +++ b/actors/states/election_test.go @@ -10,13 +10,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/miner" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/power" - "github.com/filecoin-project/specs-actors/v6/actors/states" - "github.com/filecoin-project/specs-actors/v6/actors/util/adt" - "github.com/filecoin-project/specs-actors/v6/support/ipld" - tutil "github.com/filecoin-project/specs-actors/v6/support/testing" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/miner" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/power" + "github.com/filecoin-project/specs-actors/v7/actors/states" + "github.com/filecoin-project/specs-actors/v7/actors/util/adt" + "github.com/filecoin-project/specs-actors/v7/support/ipld" + tutil "github.com/filecoin-project/specs-actors/v7/support/testing" ) func TestMinerEligibleForElection(t *testing.T) { diff --git a/actors/states/tree.go b/actors/states/tree.go index 58f5c2cea..5ae6f2f82 100644 --- a/actors/states/tree.go +++ b/actors/states/tree.go @@ -7,8 +7,8 @@ import ( "github.com/ipfs/go-cid" "golang.org/x/xerrors" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/util/adt" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/util/adt" ) // Value type of the top level of the state tree. diff --git a/actors/states/tree_test.go b/actors/states/tree_test.go index e5530d2f0..a9af18b53 100644 --- a/actors/states/tree_test.go +++ b/actors/states/tree_test.go @@ -10,9 +10,9 @@ import ( "github.com/ipfs/go-cid" "github.com/stretchr/testify/require" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/states" - "github.com/filecoin-project/specs-actors/v6/support/ipld" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/states" + "github.com/filecoin-project/specs-actors/v7/support/ipld" ) func BenchmarkStateTreeSet(b *testing.B) { diff --git a/actors/test/commit_post_test.go b/actors/test/commit_post_test.go index 5e7f24a55..4d581a600 100644 --- a/actors/test/commit_post_test.go +++ b/actors/test/commit_post_test.go @@ -18,14 +18,14 @@ import ( "golang.org/x/text/language" "golang.org/x/text/message" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/miner" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/power" - "github.com/filecoin-project/specs-actors/v6/actors/runtime/proof" - "github.com/filecoin-project/specs-actors/v6/actors/states" - "github.com/filecoin-project/specs-actors/v6/support/ipld" - tutil "github.com/filecoin-project/specs-actors/v6/support/testing" - "github.com/filecoin-project/specs-actors/v6/support/vm" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/miner" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/power" + "github.com/filecoin-project/specs-actors/v7/actors/runtime/proof" + "github.com/filecoin-project/specs-actors/v7/actors/states" + "github.com/filecoin-project/specs-actors/v7/support/ipld" + tutil "github.com/filecoin-project/specs-actors/v7/support/testing" + "github.com/filecoin-project/specs-actors/v7/support/vm" ) func TestCommitPoStFlow(t *testing.T) { diff --git a/actors/test/committed_capacity_scenario_test.go b/actors/test/committed_capacity_scenario_test.go index bef5e99a0..e831824a9 100644 --- a/actors/test/committed_capacity_scenario_test.go +++ b/actors/test/committed_capacity_scenario_test.go @@ -10,15 +10,15 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/market" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/miner" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/power" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/verifreg" - "github.com/filecoin-project/specs-actors/v6/actors/runtime/proof" - "github.com/filecoin-project/specs-actors/v6/support/ipld" - tutil "github.com/filecoin-project/specs-actors/v6/support/testing" - "github.com/filecoin-project/specs-actors/v6/support/vm" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/market" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/miner" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/power" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/verifreg" + "github.com/filecoin-project/specs-actors/v7/actors/runtime/proof" + "github.com/filecoin-project/specs-actors/v7/support/ipld" + tutil "github.com/filecoin-project/specs-actors/v7/support/testing" + "github.com/filecoin-project/specs-actors/v7/support/vm" ) func TestReplaceCommittedCapacitySectorWithDealLadenSector(t *testing.T) { diff --git a/actors/test/common_test.go b/actors/test/common_test.go index cead90aa6..35a562e73 100644 --- a/actors/test/common_test.go +++ b/actors/test/common_test.go @@ -9,14 +9,14 @@ import ( "github.com/filecoin-project/go-state-types/big" "github.com/filecoin-project/go-state-types/crypto" "github.com/filecoin-project/go-state-types/exitcode" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/power" - "github.com/filecoin-project/specs-actors/v6/actors/states" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/power" + "github.com/filecoin-project/specs-actors/v7/actors/states" "github.com/stretchr/testify/require" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/market" - tutil "github.com/filecoin-project/specs-actors/v6/support/testing" - "github.com/filecoin-project/specs-actors/v6/support/vm" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/market" + tutil "github.com/filecoin-project/specs-actors/v7/support/testing" + "github.com/filecoin-project/specs-actors/v7/support/vm" ) func createMiner(t *testing.T, v *vm.VM, owner, worker addr.Address, wPoStProof abi.RegisteredPoStProof, balance abi.TokenAmount) *power.CreateMinerReturn { diff --git a/actors/test/cron_catches_expiries_scenario_test.go b/actors/test/cron_catches_expiries_scenario_test.go index 81d998d77..30efb3748 100644 --- a/actors/test/cron_catches_expiries_scenario_test.go +++ b/actors/test/cron_catches_expiries_scenario_test.go @@ -10,13 +10,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/miner" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/power" - "github.com/filecoin-project/specs-actors/v6/actors/runtime/proof" - "github.com/filecoin-project/specs-actors/v6/support/ipld" - tutil "github.com/filecoin-project/specs-actors/v6/support/testing" - "github.com/filecoin-project/specs-actors/v6/support/vm" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/miner" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/power" + "github.com/filecoin-project/specs-actors/v7/actors/runtime/proof" + "github.com/filecoin-project/specs-actors/v7/support/ipld" + tutil "github.com/filecoin-project/specs-actors/v7/support/testing" + "github.com/filecoin-project/specs-actors/v7/support/vm" ) var fakeChainRandomness = []byte(vm.RandString) diff --git a/actors/test/extend_sectors_test.go b/actors/test/extend_sectors_test.go index bec618dc8..5130aaccc 100644 --- a/actors/test/extend_sectors_test.go +++ b/actors/test/extend_sectors_test.go @@ -7,14 +7,14 @@ import ( "github.com/filecoin-project/go-bitfield" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/miner" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/power" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/verifreg" - "github.com/filecoin-project/specs-actors/v6/actors/runtime/proof" - "github.com/filecoin-project/specs-actors/v6/support/ipld" - tutil "github.com/filecoin-project/specs-actors/v6/support/testing" - "github.com/filecoin-project/specs-actors/v6/support/vm" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/miner" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/power" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/verifreg" + "github.com/filecoin-project/specs-actors/v7/actors/runtime/proof" + "github.com/filecoin-project/specs-actors/v7/support/ipld" + tutil "github.com/filecoin-project/specs-actors/v7/support/testing" + "github.com/filecoin-project/specs-actors/v7/support/vm" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/actors/test/market_miner_withdrawal_test.go b/actors/test/market_miner_withdrawal_test.go index 27060f882..a0983cfb9 100644 --- a/actors/test/market_miner_withdrawal_test.go +++ b/actors/test/market_miner_withdrawal_test.go @@ -11,12 +11,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/market" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/miner" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/power" - "github.com/filecoin-project/specs-actors/v6/support/ipld" - "github.com/filecoin-project/specs-actors/v6/support/vm" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/market" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/miner" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/power" + "github.com/filecoin-project/specs-actors/v7/support/ipld" + "github.com/filecoin-project/specs-actors/v7/support/vm" ) func TestMarketWithdraw(t *testing.T) { diff --git a/actors/test/multisig_delete_self_test.go b/actors/test/multisig_delete_self_test.go index 3cb300153..fe9dfa14c 100644 --- a/actors/test/multisig_delete_self_test.go +++ b/actors/test/multisig_delete_self_test.go @@ -11,11 +11,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - init_ "github.com/filecoin-project/specs-actors/v6/actors/builtin/init" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/multisig" - "github.com/filecoin-project/specs-actors/v6/support/ipld" - "github.com/filecoin-project/specs-actors/v6/support/vm" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + init_ "github.com/filecoin-project/specs-actors/v7/actors/builtin/init" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/multisig" + "github.com/filecoin-project/specs-actors/v7/support/ipld" + "github.com/filecoin-project/specs-actors/v7/support/vm" ) func TestMultisigDeleteSelf2Of3RemovedIsProposer(t *testing.T) { diff --git a/actors/test/multisig_proposal_hash_test.go b/actors/test/multisig_proposal_hash_test.go index e4cee105a..6e90dc8f1 100644 --- a/actors/test/multisig_proposal_hash_test.go +++ b/actors/test/multisig_proposal_hash_test.go @@ -9,11 +9,11 @@ import ( "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" "github.com/filecoin-project/go-state-types/exitcode" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - init_ "github.com/filecoin-project/specs-actors/v6/actors/builtin/init" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/multisig" - "github.com/filecoin-project/specs-actors/v6/support/ipld" - "github.com/filecoin-project/specs-actors/v6/support/vm" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + init_ "github.com/filecoin-project/specs-actors/v7/actors/builtin/init" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/multisig" + "github.com/filecoin-project/specs-actors/v7/support/ipld" + "github.com/filecoin-project/specs-actors/v7/support/vm" "github.com/minio/blake2b-simd" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/actors/test/power_scenario_test.go b/actors/test/power_scenario_test.go index dfc4a79eb..69a6a7c77 100644 --- a/actors/test/power_scenario_test.go +++ b/actors/test/power_scenario_test.go @@ -8,12 +8,12 @@ import ( "github.com/filecoin-project/go-state-types/big" "github.com/stretchr/testify/require" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/miner" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/power" - "github.com/filecoin-project/specs-actors/v6/support/ipld" - tutil "github.com/filecoin-project/specs-actors/v6/support/testing" - "github.com/filecoin-project/specs-actors/v6/support/vm" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/miner" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/power" + "github.com/filecoin-project/specs-actors/v7/support/ipld" + tutil "github.com/filecoin-project/specs-actors/v7/support/testing" + "github.com/filecoin-project/specs-actors/v7/support/vm" ) func TestCreateMiner(t *testing.T) { diff --git a/actors/test/publish-deals_test.go b/actors/test/publish-deals_test.go index 9c7ac58e2..e6ee2e300 100644 --- a/actors/test/publish-deals_test.go +++ b/actors/test/publish-deals_test.go @@ -7,13 +7,13 @@ import ( "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/miner" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/power" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/verifreg" - "github.com/filecoin-project/specs-actors/v6/support/ipld" - tutil "github.com/filecoin-project/specs-actors/v6/support/testing" - "github.com/filecoin-project/specs-actors/v6/support/vm" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/miner" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/power" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/verifreg" + "github.com/filecoin-project/specs-actors/v7/support/ipld" + tutil "github.com/filecoin-project/specs-actors/v7/support/testing" + "github.com/filecoin-project/specs-actors/v7/support/vm" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/actors/test/terminate_sectors_scenario_test.go b/actors/test/terminate_sectors_scenario_test.go index 9357f27c7..79b808c0a 100644 --- a/actors/test/terminate_sectors_scenario_test.go +++ b/actors/test/terminate_sectors_scenario_test.go @@ -10,15 +10,15 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/market" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/miner" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/power" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/verifreg" - "github.com/filecoin-project/specs-actors/v6/actors/runtime/proof" - "github.com/filecoin-project/specs-actors/v6/support/ipld" - tutil "github.com/filecoin-project/specs-actors/v6/support/testing" - "github.com/filecoin-project/specs-actors/v6/support/vm" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/market" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/miner" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/power" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/verifreg" + "github.com/filecoin-project/specs-actors/v7/actors/runtime/proof" + "github.com/filecoin-project/specs-actors/v7/support/ipld" + tutil "github.com/filecoin-project/specs-actors/v7/support/testing" + "github.com/filecoin-project/specs-actors/v7/support/vm" ) // This scenario hits all Market Actor methods. diff --git a/actors/util/adt/array_test.go b/actors/util/adt/array_test.go index dfce2520e..e1702cc22 100644 --- a/actors/util/adt/array_test.go +++ b/actors/util/adt/array_test.go @@ -6,8 +6,8 @@ import ( "github.com/filecoin-project/go-address" "github.com/stretchr/testify/require" - "github.com/filecoin-project/specs-actors/v6/actors/util/adt" - "github.com/filecoin-project/specs-actors/v6/support/mock" + "github.com/filecoin-project/specs-actors/v7/actors/util/adt" + "github.com/filecoin-project/specs-actors/v7/support/mock" ) func TestArrayNotFound(t *testing.T) { diff --git a/actors/util/adt/balancetable_test.go b/actors/util/adt/balancetable_test.go index 6736ff6bd..0453f54e9 100644 --- a/actors/util/adt/balancetable_test.go +++ b/actors/util/adt/balancetable_test.go @@ -9,10 +9,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/util/adt" - "github.com/filecoin-project/specs-actors/v6/support/mock" - tutil "github.com/filecoin-project/specs-actors/v6/support/testing" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/util/adt" + "github.com/filecoin-project/specs-actors/v7/support/mock" + tutil "github.com/filecoin-project/specs-actors/v7/support/testing" ) func TestBalanceTable(t *testing.T) { diff --git a/actors/util/adt/store.go b/actors/util/adt/store.go index f31380626..4e4defac0 100644 --- a/actors/util/adt/store.go +++ b/actors/util/adt/store.go @@ -9,7 +9,7 @@ import ( cid "github.com/ipfs/go-cid" ipldcbor "github.com/ipfs/go-ipld-cbor" - vmr "github.com/filecoin-project/specs-actors/v6/actors/runtime" + vmr "github.com/filecoin-project/specs-actors/v7/actors/runtime" ) type Store = adt2.Store diff --git a/actors/util/bitfield_test.go b/actors/util/bitfield_test.go index 78b3b68c9..8c976abaf 100644 --- a/actors/util/bitfield_test.go +++ b/actors/util/bitfield_test.go @@ -7,7 +7,7 @@ import ( "github.com/filecoin-project/go-bitfield" "github.com/stretchr/testify/assert" - "github.com/filecoin-project/specs-actors/v6/actors/util" + "github.com/filecoin-project/specs-actors/v7/actors/util" ) func TestBitFieldUnset(t *testing.T) { diff --git a/actors/util/math/exp_test.go b/actors/util/math/exp_test.go index feeb36c1a..6d4683c96 100644 --- a/actors/util/math/exp_test.go +++ b/actors/util/math/exp_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/specs-actors/v6/actors/util/math" + "github.com/filecoin-project/specs-actors/v7/actors/util/math" "github.com/stretchr/testify/assert" ) diff --git a/actors/util/math/expneg_test.go b/actors/util/math/expneg_test.go index 4b9c9f601..1f7ff1944 100644 --- a/actors/util/math/expneg_test.go +++ b/actors/util/math/expneg_test.go @@ -8,7 +8,7 @@ import ( "github.com/xorcare/golden" - "github.com/filecoin-project/specs-actors/v6/actors/util/math" + "github.com/filecoin-project/specs-actors/v7/actors/util/math" ) var Res big.Word diff --git a/actors/util/math/ln_test.go b/actors/util/math/ln_test.go index 264be705d..4cf5015c7 100644 --- a/actors/util/math/ln_test.go +++ b/actors/util/math/ln_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/specs-actors/v6/actors/util/math" + "github.com/filecoin-project/specs-actors/v7/actors/util/math" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/actors/util/smoothing/alpha_beta_filter.go b/actors/util/smoothing/alpha_beta_filter.go index 53ab7bc6b..c03a6c01c 100644 --- a/actors/util/smoothing/alpha_beta_filter.go +++ b/actors/util/smoothing/alpha_beta_filter.go @@ -4,7 +4,7 @@ import ( "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/specs-actors/v6/actors/util/math" + "github.com/filecoin-project/specs-actors/v7/actors/util/math" ) var ( diff --git a/actors/util/smoothing/alpha_beta_filter_test.go b/actors/util/smoothing/alpha_beta_filter_test.go index 65bb5dc11..13f435371 100644 --- a/actors/util/smoothing/alpha_beta_filter_test.go +++ b/actors/util/smoothing/alpha_beta_filter_test.go @@ -7,9 +7,9 @@ import ( "github.com/filecoin-project/go-state-types/big" "github.com/stretchr/testify/assert" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/util/math" - "github.com/filecoin-project/specs-actors/v6/actors/util/smoothing" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/util/math" + "github.com/filecoin-project/specs-actors/v7/actors/util/smoothing" ) // project of cumsum ratio is equal to cumsum of ratio of projections diff --git a/gen/gen.go b/gen/gen.go index 83007d2d9..f707dfd30 100644 --- a/gen/gen.go +++ b/gen/gen.go @@ -3,20 +3,20 @@ package main import ( gen "github.com/whyrusleeping/cbor-gen" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/account" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/cron" - init_ "github.com/filecoin-project/specs-actors/v6/actors/builtin/init" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/market" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/miner" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/multisig" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/paych" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/power" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/reward" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/system" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/verifreg" - "github.com/filecoin-project/specs-actors/v6/actors/util/smoothing" - "github.com/filecoin-project/specs-actors/v6/support/vm" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/account" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/cron" + init_ "github.com/filecoin-project/specs-actors/v7/actors/builtin/init" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/market" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/miner" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/multisig" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/paych" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/power" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/reward" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/system" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/verifreg" + "github.com/filecoin-project/specs-actors/v7/actors/util/smoothing" + "github.com/filecoin-project/specs-actors/v7/support/vm" ) func main() { diff --git a/go.mod b/go.mod index 33ce7b901..43075714e 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/filecoin-project/specs-actors/v6 +module github.com/filecoin-project/specs-actors/v7 go 1.17 @@ -13,6 +13,7 @@ require ( github.com/filecoin-project/specs-actors/v3 v3.1.0 github.com/filecoin-project/specs-actors/v4 v4.0.0 github.com/filecoin-project/specs-actors/v5 v5.0.4 + github.com/filecoin-project/specs-actors/v6 v6.0.0 github.com/ipfs/go-block-format v0.0.3 github.com/ipfs/go-cid v0.0.7 github.com/ipfs/go-ipld-cbor v0.0.5 @@ -68,4 +69,4 @@ require ( golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8 // indirect golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb // indirect gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect -) +) \ No newline at end of file diff --git a/go.sum b/go.sum index 158edfb95..db78d1fe3 100644 --- a/go.sum +++ b/go.sum @@ -63,6 +63,8 @@ github.com/filecoin-project/specs-actors/v4 v4.0.0 h1:vMALksY5G3J5rj3q9rbcyB+f4T github.com/filecoin-project/specs-actors/v4 v4.0.0/go.mod h1:TkHXf/l7Wyw4ZejyXIPS2rK8bBO0rdwhTZyQQgaglng= github.com/filecoin-project/specs-actors/v5 v5.0.4 h1:OY7BdxJWlUfUFXWV/kpNBYGXNPasDIedf42T3sGx08s= github.com/filecoin-project/specs-actors/v5 v5.0.4/go.mod h1:5BAKRAMsOOlD8+qCw4UvT/lTLInCJ3JwOWZbX8Ipwq4= +github.com/filecoin-project/specs-actors/v6 v6.0.0 h1:i+16MFE8GScWWUF0kG7x2RZ5Hqpz0CeyBHTpnijCJ6I= +github.com/filecoin-project/specs-actors/v6 v6.0.0/go.mod h1:V1AYfi5GkHXipx1mnVivoICZh3wtwPxDVuds+fbfQtk= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/go-check/check v0.0.0-20180628173108-788fd7840127 h1:0gkP6mzaMqkmpcJYCFOLkIBwI7xFExG03bbkOkCvUPI= github.com/go-check/check v0.0.0-20180628173108-788fd7840127/go.mod h1:9ES+weclKsC9YodN5RgxqK/VD9HM9JsCSh7rNhMZE98= diff --git a/support/agent/cases_test.go b/support/agent/cases_test.go index f8e43bb62..5094cb62e 100644 --- a/support/agent/cases_test.go +++ b/support/agent/cases_test.go @@ -13,12 +13,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/power" - "github.com/filecoin-project/specs-actors/v6/actors/states" - "github.com/filecoin-project/specs-actors/v6/support/agent" - "github.com/filecoin-project/specs-actors/v6/support/ipld" - "github.com/filecoin-project/specs-actors/v6/support/vm" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/power" + "github.com/filecoin-project/specs-actors/v7/actors/states" + "github.com/filecoin-project/specs-actors/v7/support/agent" + "github.com/filecoin-project/specs-actors/v7/support/ipld" + "github.com/filecoin-project/specs-actors/v7/support/vm" ) func TestCreate20Miners(t *testing.T) { diff --git a/support/agent/deal_client_agent.go b/support/agent/deal_client_agent.go index 0ecf47b44..3251ccb61 100644 --- a/support/agent/deal_client_agent.go +++ b/support/agent/deal_client_agent.go @@ -13,10 +13,10 @@ import ( "github.com/filecoin-project/go-state-types/big" "github.com/filecoin-project/go-state-types/cbor" "github.com/filecoin-project/go-state-types/crypto" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/market" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/power" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/reward" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/market" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/power" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/reward" "github.com/ipfs/go-cid" ) diff --git a/support/agent/miner_agent.go b/support/agent/miner_agent.go index 3be761b65..68b2822de 100644 --- a/support/agent/miner_agent.go +++ b/support/agent/miner_agent.go @@ -16,12 +16,12 @@ import ( mh "github.com/multiformats/go-multihash" "golang.org/x/xerrors" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/market" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/market" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/miner" - "github.com/filecoin-project/specs-actors/v6/actors/runtime/proof" - "github.com/filecoin-project/specs-actors/v6/support/vm" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/miner" + "github.com/filecoin-project/specs-actors/v7/actors/runtime/proof" + "github.com/filecoin-project/specs-actors/v7/support/vm" ) type MinerAgentConfig struct { diff --git a/support/agent/miner_generator.go b/support/agent/miner_generator.go index a1469e950..8563fb235 100644 --- a/support/agent/miner_generator.go +++ b/support/agent/miner_generator.go @@ -7,8 +7,8 @@ import ( "github.com/filecoin-project/go-state-types/cbor" "golang.org/x/xerrors" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/power" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/power" ) // MinerGenerator adds miner agents to the simulation at a configured rate. diff --git a/support/agent/miner_state.go b/support/agent/miner_state.go index cfceb7832..dd2f620b1 100644 --- a/support/agent/miner_state.go +++ b/support/agent/miner_state.go @@ -8,8 +8,8 @@ import ( "github.com/filecoin-project/go-state-types/big" "github.com/filecoin-project/go-state-types/dline" miner4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/miner" - miner5 "github.com/filecoin-project/specs-actors/v6/actors/builtin/miner" - "github.com/filecoin-project/specs-actors/v6/actors/util/adt" + miner5 "github.com/filecoin-project/specs-actors/v7/actors/builtin/miner" + "github.com/filecoin-project/specs-actors/v7/actors/util/adt" cid "github.com/ipfs/go-cid" ) diff --git a/support/agent/sim.go b/support/agent/sim.go index 858d684c8..e09ee03ab 100644 --- a/support/agent/sim.go +++ b/support/agent/sim.go @@ -21,14 +21,14 @@ import ( adt2 "github.com/filecoin-project/specs-actors/v2/actors/util/adt" vm2 "github.com/filecoin-project/specs-actors/v2/support/vm" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/market" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/power" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/reward" - "github.com/filecoin-project/specs-actors/v6/actors/states" - "github.com/filecoin-project/specs-actors/v6/actors/util/adt" - "github.com/filecoin-project/specs-actors/v6/support/ipld" - "github.com/filecoin-project/specs-actors/v6/support/vm" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/market" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/power" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/reward" + "github.com/filecoin-project/specs-actors/v7/actors/states" + "github.com/filecoin-project/specs-actors/v7/actors/util/adt" + "github.com/filecoin-project/specs-actors/v7/support/ipld" + "github.com/filecoin-project/specs-actors/v7/support/vm" ) // Sim is a simulation framework to exercise actor code in a network-like environment. diff --git a/support/ipld/store.go b/support/ipld/store.go index d152fbadd..98ae1bdc2 100644 --- a/support/ipld/store.go +++ b/support/ipld/store.go @@ -9,7 +9,7 @@ import ( "github.com/ipfs/go-cid" ipldcbor "github.com/ipfs/go-ipld-cbor" - "github.com/filecoin-project/specs-actors/v6/actors/util/adt" + "github.com/filecoin-project/specs-actors/v7/actors/util/adt" ) // Creates a new, empty, unsynchronized IPLD store in memory. @@ -24,6 +24,7 @@ func NewADTStore(ctx context.Context) adt.Store { type BlockStoreInMemory struct { data map[cid.Cid]block.Block } + var _ ipldcbor.IpldBlockstore = (*BlockStoreInMemory)(nil) func NewBlockStoreInMemory() *BlockStoreInMemory { @@ -81,6 +82,7 @@ type MetricsBlockStore struct { Reads uint64 ReadBytes uint64 } + var _ ipldcbor.IpldBlockstore = (*MetricsBlockStore)(nil) func NewMetricsBlockStore(underlying ipldcbor.IpldBlockstore) *MetricsBlockStore { diff --git a/support/mock/mockrt.go b/support/mock/mockrt.go index ad1c7f6f5..2930a1629 100644 --- a/support/mock/mockrt.go +++ b/support/mock/mockrt.go @@ -21,12 +21,12 @@ import ( cid "github.com/ipfs/go-cid" mh "github.com/multiformats/go-multihash" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/exported" - "github.com/filecoin-project/specs-actors/v6/actors/runtime" - "github.com/filecoin-project/specs-actors/v6/actors/runtime/proof" - "github.com/filecoin-project/specs-actors/v6/actors/util/adt" - "github.com/filecoin-project/specs-actors/v6/support/ipld" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/exported" + "github.com/filecoin-project/specs-actors/v7/actors/runtime" + "github.com/filecoin-project/specs-actors/v7/actors/runtime/proof" + "github.com/filecoin-project/specs-actors/v7/actors/util/adt" + "github.com/filecoin-project/specs-actors/v7/support/ipld" ) // A mock runtime for unit testing of actors in isolation. diff --git a/support/mock/mockrt_state_test.go b/support/mock/mockrt_state_test.go index cb0a5dd9f..2a7f15139 100644 --- a/support/mock/mockrt_state_test.go +++ b/support/mock/mockrt_state_test.go @@ -11,9 +11,9 @@ import ( mh "github.com/multiformats/go-multihash" cbg "github.com/whyrusleeping/cbor-gen" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/runtime" - tutil "github.com/filecoin-project/specs-actors/v6/support/testing" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/runtime" + tutil "github.com/filecoin-project/specs-actors/v7/support/testing" ) type FakeActor struct{} diff --git a/support/tools/go.mod b/support/tools/go.mod index 7724e570e..292ded35a 100644 --- a/support/tools/go.mod +++ b/support/tools/go.mod @@ -1,4 +1,4 @@ -module github.com/filecoin-project/specs-actors/v6/support/tools +module github.com/filecoin-project/specs-actors/v7/support/tools go 1.17 diff --git a/support/vm/invocation_context.go b/support/vm/invocation_context.go index 9172753d1..3ddfe4160 100644 --- a/support/vm/invocation_context.go +++ b/support/vm/invocation_context.go @@ -22,14 +22,14 @@ import ( mh "github.com/multiformats/go-multihash" "golang.org/x/xerrors" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - init_ "github.com/filecoin-project/specs-actors/v6/actors/builtin/init" - "github.com/filecoin-project/specs-actors/v6/actors/runtime" - "github.com/filecoin-project/specs-actors/v6/actors/runtime/proof" - "github.com/filecoin-project/specs-actors/v6/actors/states" - "github.com/filecoin-project/specs-actors/v6/actors/util/adt" - "github.com/filecoin-project/specs-actors/v6/support/ipld" - "github.com/filecoin-project/specs-actors/v6/support/testing" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + init_ "github.com/filecoin-project/specs-actors/v7/actors/builtin/init" + "github.com/filecoin-project/specs-actors/v7/actors/runtime" + "github.com/filecoin-project/specs-actors/v7/actors/runtime/proof" + "github.com/filecoin-project/specs-actors/v7/actors/states" + "github.com/filecoin-project/specs-actors/v7/actors/util/adt" + "github.com/filecoin-project/specs-actors/v7/support/ipld" + "github.com/filecoin-project/specs-actors/v7/support/testing" ) var EmptyObjectCid cid.Cid diff --git a/support/vm/price_list.go b/support/vm/price_list.go index 148840fec..a7002830a 100644 --- a/support/vm/price_list.go +++ b/support/vm/price_list.go @@ -6,8 +6,8 @@ import ( abi "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/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/runtime/proof" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/runtime/proof" ) type Pricelist interface { diff --git a/support/vm/testing.go b/support/vm/testing.go index 3fd7e2392..bb689fa19 100644 --- a/support/vm/testing.go +++ b/support/vm/testing.go @@ -18,24 +18,23 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/filecoin-project/specs-actors/v5/support/vm" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/account" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/cron" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/exported" - initactor "github.com/filecoin-project/specs-actors/v6/actors/builtin/init" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/market" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/miner" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/power" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/reward" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/system" - "github.com/filecoin-project/specs-actors/v6/actors/builtin/verifreg" - "github.com/filecoin-project/specs-actors/v6/actors/runtime" - "github.com/filecoin-project/specs-actors/v6/actors/runtime/proof" - "github.com/filecoin-project/specs-actors/v6/actors/states" - "github.com/filecoin-project/specs-actors/v6/actors/util/adt" - "github.com/filecoin-project/specs-actors/v6/actors/util/smoothing" - actor_testing "github.com/filecoin-project/specs-actors/v6/support/testing" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/account" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/cron" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/exported" + initactor "github.com/filecoin-project/specs-actors/v7/actors/builtin/init" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/market" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/miner" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/power" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/reward" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/system" + "github.com/filecoin-project/specs-actors/v7/actors/builtin/verifreg" + "github.com/filecoin-project/specs-actors/v7/actors/runtime" + "github.com/filecoin-project/specs-actors/v7/actors/runtime/proof" + "github.com/filecoin-project/specs-actors/v7/actors/states" + "github.com/filecoin-project/specs-actors/v7/actors/util/adt" + "github.com/filecoin-project/specs-actors/v7/actors/util/smoothing" + actor_testing "github.com/filecoin-project/specs-actors/v7/support/testing" ) var FIL = big.NewInt(1e18) @@ -360,7 +359,7 @@ func AdvanceByDeadlineTillEpochWhileProving(t *testing.T, v *VM, minerIDAddress, PoStProof: abi.RegisteredPoStProof_StackedDrgWindow32GiBV1, }}, ChainCommitEpoch: dlInfo.Challenge, - ChainCommitRand: []byte(vm.RandString), + ChainCommitRand: []byte(RandString), } ApplyOk(t, v, worker, minerIDAddress, big.Zero(), builtin.MethodsMiner.SubmitWindowedPoSt, &submitParams) v, _ = AdvanceByDeadlineTillIndex(t, v, minerIDAddress, dlInfo.Index+2%miner.WPoStPeriodDeadlines) diff --git a/support/vm/vector.go b/support/vm/vector.go index a8489fd06..66a12b533 100644 --- a/support/vm/vector.go +++ b/support/vm/vector.go @@ -12,8 +12,8 @@ import ( "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" "github.com/filecoin-project/go-state-types/network" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - "github.com/filecoin-project/specs-actors/v6/actors/util/adt" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/util/adt" blocks "github.com/ipfs/go-block-format" "github.com/ipfs/go-cid" diff --git a/support/vm/vector_gen.go b/support/vm/vector_gen.go index 02b3647ed..ad442b9d5 100644 --- a/support/vm/vector_gen.go +++ b/support/vm/vector_gen.go @@ -8,7 +8,7 @@ import ( "github.com/filecoin-project/go-address" abi "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" ) // diff --git a/support/vm/vm.go b/support/vm/vm.go index 57a7a07ea..c5d050c73 100644 --- a/support/vm/vm.go +++ b/support/vm/vm.go @@ -16,11 +16,11 @@ import ( "github.com/ipfs/go-cid" "golang.org/x/xerrors" - "github.com/filecoin-project/specs-actors/v6/actors/builtin" - init_ "github.com/filecoin-project/specs-actors/v6/actors/builtin/init" - "github.com/filecoin-project/specs-actors/v6/actors/runtime" - "github.com/filecoin-project/specs-actors/v6/actors/states" - "github.com/filecoin-project/specs-actors/v6/actors/util/adt" + "github.com/filecoin-project/specs-actors/v7/actors/builtin" + init_ "github.com/filecoin-project/specs-actors/v7/actors/builtin/init" + "github.com/filecoin-project/specs-actors/v7/actors/runtime" + "github.com/filecoin-project/specs-actors/v7/actors/states" + "github.com/filecoin-project/specs-actors/v7/actors/util/adt" ) // VM is a simplified message execution framework for the purposes of testing inter-actor communication.