From a8c9eeef3d1d674d41e0f95e749ec6b9b9ed6f7f Mon Sep 17 00:00:00 2001 From: zenground0 Date: Thu, 7 Apr 2022 15:03:37 -0600 Subject: [PATCH] Update to new label type in v8 actors --- discovery/impl/local_test.go | 2 +- go.mod | 3 ++- go.sum | 6 ++++++ retrievalmarket/impl/provider_test.go | 2 +- retrievalmarket/migrations/migrations_test.go | 2 +- shared_testutil/generators.go | 2 +- storagemarket/impl/client.go | 2 +- storagemarket/impl/client_test.go | 2 +- storagemarket/impl/clientstates/client_states_test.go | 2 +- storagemarket/impl/clientutils/clientutils.go | 5 +++-- storagemarket/impl/provider_test.go | 2 +- storagemarket/impl/providerstates/provider_states.go | 4 ++-- storagemarket/impl/providerstates/provider_states_test.go | 6 +++--- storagemarket/impl/providerutils/providerutils.go | 2 +- storagemarket/impl/providerutils/providerutils_test.go | 2 +- .../impl/requestvalidation/request_validation_test.go | 2 +- storagemarket/migrations/migrations.go | 2 +- storagemarket/migrations/migrations_cbor_gen.go | 2 +- storagemarket/network/types.go | 2 +- storagemarket/network/types_cbor_gen.go | 2 +- storagemarket/nodes.go | 4 ++-- storagemarket/testnodes/testnodes.go | 6 +++--- storagemarket/types.go | 2 +- storagemarket/types_cbor_gen.go | 2 +- 24 files changed, 38 insertions(+), 30 deletions(-) diff --git a/discovery/impl/local_test.go b/discovery/impl/local_test.go index db5143346..9d6037517 100644 --- a/discovery/impl/local_test.go +++ b/discovery/impl/local_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/require" "github.com/filecoin-project/go-address" - specst "github.com/filecoin-project/specs-actors/v7/support/testing" + specst "github.com/filecoin-project/specs-actors/v8/support/testing" discoveryimpl "github.com/filecoin-project/go-fil-markets/discovery/impl" "github.com/filecoin-project/go-fil-markets/discovery/migrations" diff --git a/go.mod b/go.mod index 63ca96464..e413c42c5 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,8 @@ require ( github.com/filecoin-project/index-provider v0.5.0 github.com/filecoin-project/specs-actors v0.9.13 github.com/filecoin-project/specs-actors/v2 v2.3.6 // indirect - github.com/filecoin-project/specs-actors/v7 v7.0.1-0.20220312191006-c755c0402f62 + github.com/filecoin-project/specs-actors/v7 v7.0.0 + github.com/filecoin-project/specs-actors/v8 v8.0.0-20220407202104-e375a8763a1c github.com/filecoin-project/storetheindex v0.3.5 github.com/hannahhoward/cbor-gen-for v0.0.0-20200817222906-ea96cece81f1 github.com/hannahhoward/go-pubsub v0.0.0-20200423002714-8d62886cc36e diff --git a/go.sum b/go.sum index 4c12d4d82..8cfc9b49a 100644 --- a/go.sum +++ b/go.sum @@ -278,8 +278,14 @@ github.com/filecoin-project/specs-actors/v4 v4.0.0/go.mod h1:TkHXf/l7Wyw4ZejyXIP 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/go.mod h1:V1AYfi5GkHXipx1mnVivoICZh3wtwPxDVuds+fbfQtk= +github.com/filecoin-project/specs-actors/v6 v6.0.1 h1:laxvHNsvrq83Y9n+W7znVCePi3oLyRf0Rkl4jFO8Wew= +github.com/filecoin-project/specs-actors/v6 v6.0.1/go.mod h1:V1AYfi5GkHXipx1mnVivoICZh3wtwPxDVuds+fbfQtk= +github.com/filecoin-project/specs-actors/v7 v7.0.0 h1:FQN7tjt3o68hfb3qLFSJBoLMuOFY0REkFVLO/zXj8RU= +github.com/filecoin-project/specs-actors/v7 v7.0.0/go.mod h1:TA5FwCna+Yi36POaT7SLKXsgEDvJwc0V/L6ZsO19B9M= github.com/filecoin-project/specs-actors/v7 v7.0.1-0.20220312191006-c755c0402f62 h1:3JJG6X+EepoVqrxDtYkYUjEz3CHFr4Y6Qd3SBlOYaC0= github.com/filecoin-project/specs-actors/v7 v7.0.1-0.20220312191006-c755c0402f62/go.mod h1:TA5FwCna+Yi36POaT7SLKXsgEDvJwc0V/L6ZsO19B9M= +github.com/filecoin-project/specs-actors/v8 v8.0.0-20220407202104-e375a8763a1c h1:WdAk1RfDBOhypv+tFzdonzk3jjQIfk2FJBZdRyFrLN4= +github.com/filecoin-project/specs-actors/v8 v8.0.0-20220407202104-e375a8763a1c/go.mod h1:UYIPg65iPWoFw5NEftREdJwv9b/5yaLKdCgTvNI/2FA= github.com/filecoin-project/storetheindex v0.3.5 h1:KoS9TvjPm6zIZfUH8atAHJbVHOO7GTP1MdTG+v0eE+Q= github.com/filecoin-project/storetheindex v0.3.5/go.mod h1:0r3d0kSpK63O6AvLr1CjAINLi+nWD49clzcnKV+GLpI= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= diff --git a/retrievalmarket/impl/provider_test.go b/retrievalmarket/impl/provider_test.go index c1460e40d..87882c5f3 100644 --- a/retrievalmarket/impl/provider_test.go +++ b/retrievalmarket/impl/provider_test.go @@ -23,7 +23,7 @@ import ( datatransfer "github.com/filecoin-project/go-data-transfer" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" - spect "github.com/filecoin-project/specs-actors/v7/support/testing" + spect "github.com/filecoin-project/specs-actors/v8/support/testing" "github.com/filecoin-project/go-fil-markets/piecestore" piecemigrations "github.com/filecoin-project/go-fil-markets/piecestore/migrations" diff --git a/retrievalmarket/migrations/migrations_test.go b/retrievalmarket/migrations/migrations_test.go index c404c2903..470235178 100644 --- a/retrievalmarket/migrations/migrations_test.go +++ b/retrievalmarket/migrations/migrations_test.go @@ -15,7 +15,7 @@ import ( "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" "github.com/filecoin-project/go-statemachine/fsm" - tutils "github.com/filecoin-project/specs-actors/v7/support/testing" + tutils "github.com/filecoin-project/specs-actors/v8/support/testing" "github.com/filecoin-project/go-fil-markets/piecestore/migrations" "github.com/filecoin-project/go-fil-markets/retrievalmarket" diff --git a/shared_testutil/generators.go b/shared_testutil/generators.go index cba4d257d..da7a33a32 100644 --- a/shared_testutil/generators.go +++ b/shared_testutil/generators.go @@ -17,7 +17,7 @@ import ( "github.com/filecoin-project/go-state-types/big" "github.com/filecoin-project/go-state-types/crypto" "github.com/filecoin-project/specs-actors/actors/builtin/paych" - "github.com/filecoin-project/specs-actors/v7/actors/builtin/market" + "github.com/filecoin-project/specs-actors/v8/actors/builtin/market" "github.com/filecoin-project/go-fil-markets/retrievalmarket" "github.com/filecoin-project/go-fil-markets/storagemarket" diff --git a/storagemarket/impl/client.go b/storagemarket/impl/client.go index 7f3836683..0c46c4c2a 100644 --- a/storagemarket/impl/client.go +++ b/storagemarket/impl/client.go @@ -21,7 +21,7 @@ import ( "github.com/filecoin-project/go-state-types/big" "github.com/filecoin-project/go-state-types/exitcode" "github.com/filecoin-project/go-statemachine/fsm" - "github.com/filecoin-project/specs-actors/v7/actors/builtin/market" + "github.com/filecoin-project/specs-actors/v8/actors/builtin/market" discoveryimpl "github.com/filecoin-project/go-fil-markets/discovery/impl" "github.com/filecoin-project/go-fil-markets/retrievalmarket" diff --git a/storagemarket/impl/client_test.go b/storagemarket/impl/client_test.go index 95a4b2031..1adc8e333 100644 --- a/storagemarket/impl/client_test.go +++ b/storagemarket/impl/client_test.go @@ -19,7 +19,7 @@ import ( cborutil "github.com/filecoin-project/go-cbor-util" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/specs-actors/v7/actors/builtin/market" + "github.com/filecoin-project/specs-actors/v8/actors/builtin/market" "github.com/filecoin-project/go-fil-markets/shared_testutil" "github.com/filecoin-project/go-fil-markets/storagemarket" diff --git a/storagemarket/impl/clientstates/client_states_test.go b/storagemarket/impl/clientstates/client_states_test.go index a4f70692d..dabae7077 100644 --- a/storagemarket/impl/clientstates/client_states_test.go +++ b/storagemarket/impl/clientstates/client_states_test.go @@ -19,7 +19,7 @@ import ( "github.com/filecoin-project/go-state-types/exitcode" "github.com/filecoin-project/go-statemachine/fsm" fsmtest "github.com/filecoin-project/go-statemachine/fsm/testutil" - "github.com/filecoin-project/specs-actors/v7/actors/builtin/market" + "github.com/filecoin-project/specs-actors/v8/actors/builtin/market" tut "github.com/filecoin-project/go-fil-markets/shared_testutil" "github.com/filecoin-project/go-fil-markets/storagemarket" diff --git a/storagemarket/impl/clientutils/clientutils.go b/storagemarket/impl/clientutils/clientutils.go index 1949c8ced..523f460ec 100644 --- a/storagemarket/impl/clientutils/clientutils.go +++ b/storagemarket/impl/clientutils/clientutils.go @@ -3,7 +3,8 @@ package clientutils import ( "context" - "github.com/filecoin-project/specs-actors/v7/actors/builtin/market" + + "github.com/filecoin-project/specs-actors/v8/actors/builtin/market" "github.com/ipfs/go-cid" bstore "github.com/ipfs/go-ipfs-blockstore" @@ -109,5 +110,5 @@ func LabelField(payloadCID cid.Cid) (market.DealLabel, error) { return market.EmptyDealLabel, err } - return market.NewDealLabelFromString(cidStr) + return market.NewLabelFromString(cidStr) } diff --git a/storagemarket/impl/provider_test.go b/storagemarket/impl/provider_test.go index 7d7724158..f9d43adf7 100644 --- a/storagemarket/impl/provider_test.go +++ b/storagemarket/impl/provider_test.go @@ -17,7 +17,7 @@ import ( cborutil "github.com/filecoin-project/go-cbor-util" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/specs-actors/v7/actors/builtin/market" + "github.com/filecoin-project/specs-actors/v8/actors/builtin/market" "github.com/filecoin-project/go-fil-markets/filestore" "github.com/filecoin-project/go-fil-markets/shared_testutil" diff --git a/storagemarket/impl/providerstates/provider_states.go b/storagemarket/impl/providerstates/provider_states.go index 856b44d0c..01727103d 100644 --- a/storagemarket/impl/providerstates/provider_states.go +++ b/storagemarket/impl/providerstates/provider_states.go @@ -17,8 +17,8 @@ import ( "github.com/filecoin-project/go-state-types/big" "github.com/filecoin-project/go-state-types/exitcode" "github.com/filecoin-project/go-statemachine/fsm" - "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/v8/actors/builtin/market" + "github.com/filecoin-project/specs-actors/v8/actors/builtin/miner" "github.com/filecoin-project/go-fil-markets/filestore" "github.com/filecoin-project/go-fil-markets/piecestore" diff --git a/storagemarket/impl/providerstates/provider_states_test.go b/storagemarket/impl/providerstates/provider_states_test.go index 0573dded6..473999d06 100644 --- a/storagemarket/impl/providerstates/provider_states_test.go +++ b/storagemarket/impl/providerstates/provider_states_test.go @@ -27,9 +27,9 @@ import ( "github.com/filecoin-project/go-state-types/exitcode" "github.com/filecoin-project/go-statemachine/fsm" fsmtest "github.com/filecoin-project/go-statemachine/fsm/testutil" - "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/verifreg" + "github.com/filecoin-project/specs-actors/v8/actors/builtin" + "github.com/filecoin-project/specs-actors/v8/actors/builtin/market" + "github.com/filecoin-project/specs-actors/v8/actors/builtin/verifreg" "github.com/filecoin-project/go-fil-markets/filestore" "github.com/filecoin-project/go-fil-markets/piecestore" diff --git a/storagemarket/impl/providerutils/providerutils.go b/storagemarket/impl/providerutils/providerutils.go index 012d2dd9d..1c56dbe44 100644 --- a/storagemarket/impl/providerutils/providerutils.go +++ b/storagemarket/impl/providerutils/providerutils.go @@ -10,7 +10,7 @@ import ( "github.com/filecoin-project/go-address" cborutil "github.com/filecoin-project/go-cbor-util" "github.com/filecoin-project/go-state-types/crypto" - "github.com/filecoin-project/specs-actors/v7/actors/builtin/market" + "github.com/filecoin-project/specs-actors/v8/actors/builtin/market" "github.com/filecoin-project/go-fil-markets/filestore" "github.com/filecoin-project/go-fil-markets/piecestore" diff --git a/storagemarket/impl/providerutils/providerutils_test.go b/storagemarket/impl/providerutils/providerutils_test.go index fc596a91b..e012d7e4c 100644 --- a/storagemarket/impl/providerutils/providerutils_test.go +++ b/storagemarket/impl/providerutils/providerutils_test.go @@ -12,7 +12,7 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/crypto" - "github.com/filecoin-project/specs-actors/v7/actors/builtin/market" + "github.com/filecoin-project/specs-actors/v8/actors/builtin/market" "github.com/filecoin-project/go-fil-markets/filestore" "github.com/filecoin-project/go-fil-markets/shared" diff --git a/storagemarket/impl/requestvalidation/request_validation_test.go b/storagemarket/impl/requestvalidation/request_validation_test.go index cea603a3c..aab3b706b 100644 --- a/storagemarket/impl/requestvalidation/request_validation_test.go +++ b/storagemarket/impl/requestvalidation/request_validation_test.go @@ -17,7 +17,7 @@ import ( datatransfer "github.com/filecoin-project/go-data-transfer" "github.com/filecoin-project/go-state-types/crypto" "github.com/filecoin-project/go-statestore" - "github.com/filecoin-project/specs-actors/v7/actors/builtin/market" + "github.com/filecoin-project/specs-actors/v8/actors/builtin/market" "github.com/filecoin-project/go-fil-markets/storagemarket" rv "github.com/filecoin-project/go-fil-markets/storagemarket/impl/requestvalidation" diff --git a/storagemarket/migrations/migrations.go b/storagemarket/migrations/migrations.go index 18e4c90c4..528fbd314 100644 --- a/storagemarket/migrations/migrations.go +++ b/storagemarket/migrations/migrations.go @@ -12,7 +12,7 @@ import ( "github.com/filecoin-project/go-ds-versioning/pkg/versioned" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/crypto" - "github.com/filecoin-project/specs-actors/v7/actors/builtin/market" + "github.com/filecoin-project/specs-actors/v8/actors/builtin/market" "github.com/filecoin-project/go-fil-markets/filestore" "github.com/filecoin-project/go-fil-markets/storagemarket" diff --git a/storagemarket/migrations/migrations_cbor_gen.go b/storagemarket/migrations/migrations_cbor_gen.go index 5e641c708..04dcecb4e 100644 --- a/storagemarket/migrations/migrations_cbor_gen.go +++ b/storagemarket/migrations/migrations_cbor_gen.go @@ -11,7 +11,7 @@ import ( filestore "github.com/filecoin-project/go-fil-markets/filestore" abi "github.com/filecoin-project/go-state-types/abi" crypto "github.com/filecoin-project/go-state-types/crypto" - market "github.com/filecoin-project/specs-actors/v7/actors/builtin/market" + market "github.com/filecoin-project/specs-actors/v8/actors/builtin/market" cid "github.com/ipfs/go-cid" peer "github.com/libp2p/go-libp2p-core/peer" cbg "github.com/whyrusleeping/cbor-gen" diff --git a/storagemarket/network/types.go b/storagemarket/network/types.go index 4fd573348..002a298d3 100644 --- a/storagemarket/network/types.go +++ b/storagemarket/network/types.go @@ -5,7 +5,7 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/crypto" - "github.com/filecoin-project/specs-actors/v7/actors/builtin/market" + "github.com/filecoin-project/specs-actors/v8/actors/builtin/market" "github.com/filecoin-project/go-fil-markets/storagemarket" ) diff --git a/storagemarket/network/types_cbor_gen.go b/storagemarket/network/types_cbor_gen.go index 769fd1cf5..acda775c5 100644 --- a/storagemarket/network/types_cbor_gen.go +++ b/storagemarket/network/types_cbor_gen.go @@ -10,7 +10,7 @@ import ( storagemarket "github.com/filecoin-project/go-fil-markets/storagemarket" crypto "github.com/filecoin-project/go-state-types/crypto" - market "github.com/filecoin-project/specs-actors/v7/actors/builtin/market" + market "github.com/filecoin-project/specs-actors/v8/actors/builtin/market" cid "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" xerrors "golang.org/x/xerrors" diff --git a/storagemarket/nodes.go b/storagemarket/nodes.go index a18abe0ff..c6c48609a 100644 --- a/storagemarket/nodes.go +++ b/storagemarket/nodes.go @@ -9,8 +9,8 @@ import ( "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/crypto" "github.com/filecoin-project/go-state-types/exitcode" - "github.com/filecoin-project/specs-actors/v7/actors/builtin/market" - "github.com/filecoin-project/specs-actors/v7/actors/builtin/verifreg" + "github.com/filecoin-project/specs-actors/v8/actors/builtin/market" + "github.com/filecoin-project/specs-actors/v8/actors/builtin/verifreg" "github.com/filecoin-project/go-fil-markets/shared" ) diff --git a/storagemarket/testnodes/testnodes.go b/storagemarket/testnodes/testnodes.go index df1b0b3da..4beded994 100644 --- a/storagemarket/testnodes/testnodes.go +++ b/storagemarket/testnodes/testnodes.go @@ -18,9 +18,9 @@ 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/v7/actors/builtin" - "github.com/filecoin-project/specs-actors/v7/actors/builtin/market" - "github.com/filecoin-project/specs-actors/v7/actors/builtin/verifreg" + "github.com/filecoin-project/specs-actors/v8/actors/builtin" + "github.com/filecoin-project/specs-actors/v8/actors/builtin/market" + "github.com/filecoin-project/specs-actors/v8/actors/builtin/verifreg" "github.com/filecoin-project/go-fil-markets/commp" "github.com/filecoin-project/go-fil-markets/shared" diff --git a/storagemarket/types.go b/storagemarket/types.go index c2d405962..4dd3b0686 100644 --- a/storagemarket/types.go +++ b/storagemarket/types.go @@ -14,7 +14,7 @@ import ( datatransfer "github.com/filecoin-project/go-data-transfer" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/crypto" - "github.com/filecoin-project/specs-actors/v7/actors/builtin/market" + "github.com/filecoin-project/specs-actors/v8/actors/builtin/market" "github.com/filecoin-project/go-fil-markets/filestore" ) diff --git a/storagemarket/types_cbor_gen.go b/storagemarket/types_cbor_gen.go index b357b3c49..901acfc3f 100644 --- a/storagemarket/types_cbor_gen.go +++ b/storagemarket/types_cbor_gen.go @@ -12,7 +12,7 @@ import ( filestore "github.com/filecoin-project/go-fil-markets/filestore" abi "github.com/filecoin-project/go-state-types/abi" crypto "github.com/filecoin-project/go-state-types/crypto" - market "github.com/filecoin-project/specs-actors/v7/actors/builtin/market" + market "github.com/filecoin-project/specs-actors/v8/actors/builtin/market" cid "github.com/ipfs/go-cid" peer "github.com/libp2p/go-libp2p-core/peer" cbg "github.com/whyrusleeping/cbor-gen"