From 51b501ddaf42bf0715f5ac2d3362023e2e25ea04 Mon Sep 17 00:00:00 2001 From: Aayush Rajasekaran Date: Fri, 13 May 2022 15:09:17 -0400 Subject: [PATCH] Use new go-state-types state accessors (#711) --- discovery/impl/local_test.go | 5 ++- go.mod | 8 +---- go.sum | 36 ++----------------- .../impl/clientstates/client_states_test.go | 2 +- retrievalmarket/impl/integration_test.go | 2 +- retrievalmarket/impl/provider_test.go | 9 +++-- .../testnodes/test_retrieval_client_node.go | 12 +++---- .../testnodes/test_retrieval_provider_node.go | 8 ++--- retrievalmarket/migrations/migrations.go | 4 +-- .../migrations/migrations_cbor_gen.go | 2 +- retrievalmarket/migrations/migrations_test.go | 12 +++++-- retrievalmarket/nodes.go | 6 ++-- .../storage_retrieval_integration_test.go | 2 +- retrievalmarket/types.go | 4 +-- retrievalmarket/types_cbor_gen.go | 2 +- shared_testutil/generators.go | 24 ++++++------- shared_testutil/testutil.go | 9 ++++- storagemarket/impl/client.go | 6 ++-- storagemarket/impl/client_test.go | 2 +- .../impl/clientstates/client_states_test.go | 2 +- storagemarket/impl/clientutils/clientutils.go | 2 +- storagemarket/impl/provider_test.go | 2 +- .../impl/providerstates/provider_states.go | 8 ++--- .../providerstates/provider_states_test.go | 6 ++-- .../impl/providerutils/providerutils.go | 2 +- .../impl/providerutils/providerutils_test.go | 2 +- .../request_validation_test.go | 2 +- storagemarket/migrations/migrations.go | 2 +- .../migrations/migrations_cbor_gen.go | 2 +- storagemarket/network/types.go | 2 +- storagemarket/network/types_cbor_gen.go | 2 +- storagemarket/nodes.go | 4 +-- .../testharness/dependencies/dependencies.go | 2 +- storagemarket/testharness/testharness.go | 2 +- storagemarket/testnodes/testnodes.go | 6 ++-- storagemarket/types.go | 2 +- storagemarket/types_cbor_gen.go | 2 +- 37 files changed, 91 insertions(+), 116 deletions(-) diff --git a/discovery/impl/local_test.go b/discovery/impl/local_test.go index 9d6037517..0ba498301 100644 --- a/discovery/impl/local_test.go +++ b/discovery/impl/local_test.go @@ -13,7 +13,6 @@ import ( "github.com/stretchr/testify/require" "github.com/filecoin-project/go-address" - 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" @@ -25,13 +24,13 @@ import ( func TestLocal_AddPeer(t *testing.T) { ctx := context.Background() peer1 := retrievalmarket.RetrievalPeer{ - Address: specst.NewIDAddr(t, 1), + Address: shared_testutil.NewIDAddr(t, 1), ID: peer.NewPeerRecord().PeerID, PieceCID: nil, } pieceCid := shared_testutil.GenerateCids(1)[0] peer2 := retrievalmarket.RetrievalPeer{ - Address: specst.NewIDAddr(t, 2), + Address: shared_testutil.NewIDAddr(t, 2), ID: peer.NewPeerRecord().PeerID, PieceCID: &pieceCid, } diff --git a/go.mod b/go.mod index 72a4a80ad..3a2e8dc75 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,6 @@ require ( github.com/cespare/xxhash/v2 v2.1.2 // indirect github.com/filecoin-project/dagstore v0.5.2 github.com/filecoin-project/go-address v0.0.6 - github.com/filecoin-project/go-bitfield v0.2.4 // indirect github.com/filecoin-project/go-cbor-util v0.0.1 github.com/filecoin-project/go-commp-utils v0.1.3 github.com/filecoin-project/go-crypto v0.0.1 // indirect @@ -15,14 +14,10 @@ require ( github.com/filecoin-project/go-fil-commcid v0.1.0 github.com/filecoin-project/go-fil-commp-hashhash v0.1.0 github.com/filecoin-project/go-padreader v0.0.1 - github.com/filecoin-project/go-state-types v0.1.3 + github.com/filecoin-project/go-state-types v0.1.6 github.com/filecoin-project/go-statemachine v1.0.2-0.20220322104818-27f8fbb86dfd github.com/filecoin-project/go-statestore v0.2.0 github.com/filecoin-project/index-provider v0.6.1 - 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.0 - github.com/filecoin-project/specs-actors/v8 v8.0.0-20220407202104-e375a8763a1c github.com/hannahhoward/cbor-gen-for v0.0.0-20200817222906-ea96cece81f1 github.com/hannahhoward/go-pubsub v0.0.0-20200423002714-8d62886cc36e github.com/hashicorp/go-multierror v1.1.1 @@ -60,7 +55,6 @@ require ( github.com/stretchr/testify v1.7.0 github.com/whyrusleeping/cbor v0.0.0-20171005072247-63513f603b11 github.com/whyrusleeping/cbor-gen v0.0.0-20220302191723-37c43cae8e14 - github.com/xorcare/golden v0.6.1-0.20191112154924-b87f686d7542 // indirect golang.org/x/crypto v0.0.0-20211209193657-4570a0811e8b // indirect golang.org/x/exp v0.0.0-20210715201039-d37aa40e8013 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 diff --git a/go.sum b/go.sum index 10e910f47..4315a35df 100644 --- a/go.sum +++ b/go.sum @@ -207,15 +207,10 @@ github.com/filecoin-project/go-address v0.0.3/go.mod h1:jr8JxKsYx+lQlQZmF5i2U0Z+ github.com/filecoin-project/go-address v0.0.5/go.mod h1:jr8JxKsYx+lQlQZmF5i2U0Z+cGQ59wMIps/8YW/lDj8= github.com/filecoin-project/go-address v0.0.6 h1:DWQtj38ax+ogHwyH3VULRIoT8E6loyXqsk/p81xoY7M= github.com/filecoin-project/go-address v0.0.6/go.mod h1:7B0/5DA13n6nHkB8bbGx1gWzG/dbTsZ0fgOJVGsM3TE= -github.com/filecoin-project/go-amt-ipld/v2 v2.1.0 h1:t6qDiuGYYngDqaLc2ZUvdtAg4UNxPeOYaXhBWSNsVaM= github.com/filecoin-project/go-amt-ipld/v2 v2.1.0/go.mod h1:nfFPoGyX0CU9SkXX8EoCcSuHN1XcbN0c6KBh7yvP5fs= -github.com/filecoin-project/go-amt-ipld/v3 v3.0.0/go.mod h1:Qa95YNAbtoVCTSVtX38aAC1ptBnJfPma1R/zZsKmx4o= -github.com/filecoin-project/go-amt-ipld/v3 v3.1.0 h1:ZNJ9tEG5bE72vBWYiuh5bkxJVM3ViHNOmQ7qew9n6RE= -github.com/filecoin-project/go-amt-ipld/v3 v3.1.0/go.mod h1:UjM2QhDFrrjD5s1CdnkJkat4ga+LqZBZgTMniypABRo= github.com/filecoin-project/go-amt-ipld/v4 v4.0.0 h1:XM81BJ4/6h3FV0WfFjh74cIDIgqMbJsMBLM0fIuLUUk= github.com/filecoin-project/go-amt-ipld/v4 v4.0.0/go.mod h1:gF053YQ4BIpzTNDoEwHZas7U3oAwncDVGvOHyY8oDpE= github.com/filecoin-project/go-bitfield v0.2.0/go.mod h1:CNl9WG8hgR5mttCnUErjcQjGvuiZjRqK9rHVBsQF4oM= -github.com/filecoin-project/go-bitfield v0.2.3/go.mod h1:CNl9WG8hgR5mttCnUErjcQjGvuiZjRqK9rHVBsQF4oM= github.com/filecoin-project/go-bitfield v0.2.4 h1:uZ7MeE+XfM5lqrHJZ93OnhQKc/rveW8p9au0C68JPgk= github.com/filecoin-project/go-bitfield v0.2.4/go.mod h1:CNl9WG8hgR5mttCnUErjcQjGvuiZjRqK9rHVBsQF4oM= github.com/filecoin-project/go-cbor-util v0.0.0-20191219014500-08c40a1e63a2/go.mod h1:pqTiPHobNkOVM5thSRsHYjyQfq7O5QSCMhvuu9JoDlg= @@ -238,11 +233,6 @@ github.com/filecoin-project/go-fil-commcid v0.1.0 h1:3R4ds1A9r6cr8mvZBfMYxTS88Oq github.com/filecoin-project/go-fil-commcid v0.1.0/go.mod h1:Eaox7Hvus1JgPrL5+M3+h7aSPHc0cVqpSxA+TxIEpZQ= github.com/filecoin-project/go-fil-commp-hashhash v0.1.0 h1:imrrpZWEHRnNqqv0tN7LXep5bFEVOVmQWHJvl2mgsGo= github.com/filecoin-project/go-fil-commp-hashhash v0.1.0/go.mod h1:73S8WSEWh9vr0fDJVnKADhfIv/d6dCbAGaAGWbdJEI8= -github.com/filecoin-project/go-hamt-ipld v0.1.5 h1:uoXrKbCQZ49OHpsTCkrThPNelC4W3LPEk0OrS/ytIBM= -github.com/filecoin-project/go-hamt-ipld v0.1.5/go.mod h1:6Is+ONR5Cd5R6XZoCse1CWaXZc0Hdb/JeX+EQCQzX24= -github.com/filecoin-project/go-hamt-ipld/v2 v2.0.0 h1:b3UDemBYN2HNfk3KOXNuxgTTxlWi3xVvbQP0IT38fvM= -github.com/filecoin-project/go-hamt-ipld/v2 v2.0.0/go.mod h1:7aWZdaQ1b16BVoQUYR+eEvrDCGJoPLxFpDynFjYfBjI= -github.com/filecoin-project/go-hamt-ipld/v3 v3.0.1/go.mod h1:gXpNmr3oQx8l3o7qkGyDjJjYSRX7hp/FGOStdqrWyDI= github.com/filecoin-project/go-hamt-ipld/v3 v3.1.0 h1:rVVNq0x6RGQIzCo1iiJlGFm9AGIZzeifggxtKMU7zmI= github.com/filecoin-project/go-hamt-ipld/v3 v3.1.0/go.mod h1:bxmzgT8tmeVQA1/gvBwFmYdT8SOFUwB3ovSUfG1Ux0g= github.com/filecoin-project/go-indexer-core v0.2.9/go.mod h1:u03I3HB6ZnqCc3cm8Tq+QkTWBbfKOvNxM8K6Ny/IHRw= @@ -253,12 +243,10 @@ github.com/filecoin-project/go-padreader v0.0.1 h1:8h2tVy5HpoNbr2gBRr+WD6zV6VD6X github.com/filecoin-project/go-padreader v0.0.1/go.mod h1:VYVPJqwpsfmtoHnAmPx6MUwmrK6HIcDqZJiuZhtmfLQ= github.com/filecoin-project/go-state-types v0.0.0-20200903145444-247639ffa6ad/go.mod h1:IQ0MBPnonv35CJHtWSN3YY1Hz2gkPru1Q9qoaYLxx9I= github.com/filecoin-project/go-state-types v0.0.0-20200904021452-1883f36ca2f4/go.mod h1:IQ0MBPnonv35CJHtWSN3YY1Hz2gkPru1Q9qoaYLxx9I= -github.com/filecoin-project/go-state-types v0.0.0-20200928172055-2df22083d8ab/go.mod h1:ezYnPf0bNkTsDibL/psSz5dy4B5awOJ/E7P2Saeep8g= github.com/filecoin-project/go-state-types v0.0.0-20201102161440-c8033295a1fc/go.mod h1:ezYnPf0bNkTsDibL/psSz5dy4B5awOJ/E7P2Saeep8g= github.com/filecoin-project/go-state-types v0.1.0/go.mod h1:ezYnPf0bNkTsDibL/psSz5dy4B5awOJ/E7P2Saeep8g= -github.com/filecoin-project/go-state-types v0.1.1-0.20210810190654-139e0e79e69e/go.mod h1:ezYnPf0bNkTsDibL/psSz5dy4B5awOJ/E7P2Saeep8g= -github.com/filecoin-project/go-state-types v0.1.3 h1:rzIJyQo5HO2ptc8Jcu8P0qTutnI7NWwTle54eAHoNO0= -github.com/filecoin-project/go-state-types v0.1.3/go.mod h1:ezYnPf0bNkTsDibL/psSz5dy4B5awOJ/E7P2Saeep8g= +github.com/filecoin-project/go-state-types v0.1.6 h1:xDDYt188auutDP7miWceT8H7woW9EgunkM+EEm0mCLg= +github.com/filecoin-project/go-state-types v0.1.6/go.mod h1:UwGVoMsULoCK+bWjEdd/xLCvLAQFBC7EDT477SKml+Q= github.com/filecoin-project/go-statemachine v0.0.0-20200925024713-05bd7c71fbfe/go.mod h1:FGwQgZAt2Gh5mjlwJUlVB62JeYdo+if0xWxSEfBD9ig= github.com/filecoin-project/go-statemachine v1.0.2-0.20220322104818-27f8fbb86dfd h1:Ykxbz+LvSCUIl2zFaaPGmF8KHXTJu9T/PymgHr7IHjs= github.com/filecoin-project/go-statemachine v1.0.2-0.20220322104818-27f8fbb86dfd/go.mod h1:jZdXXiHa61n4NmgWFG4w8tnqgvZVHYbJ3yW7+y8bF54= @@ -267,24 +255,8 @@ github.com/filecoin-project/go-statestore v0.2.0 h1:cRRO0aPLrxKQCZ2UOQbzFGn4WDNd github.com/filecoin-project/go-statestore v0.2.0/go.mod h1:8sjBYbS35HwPzct7iT4lIXjLlYyPor80aU7t7a/Kspo= github.com/filecoin-project/index-provider v0.6.1 h1:yVpmtm1ASl2JZMNDC6H2Fe0neYo5akYgaJJB2wlcsMU= github.com/filecoin-project/index-provider v0.6.1/go.mod h1:iAbSQ6sUpKC4GqfUSheGnYwj9d9B+X8pPi4BV1PgwZA= +github.com/filecoin-project/specs-actors v0.9.4 h1:FePB+hrctHHiTbmaY4hnvBJzfgckN3eJreUZWpS5yks= github.com/filecoin-project/specs-actors v0.9.4/go.mod h1:BStZQzx5x7TmCkLv0Bpa07U6cPKol6fd3w9KjMPZ6Z4= -github.com/filecoin-project/specs-actors v0.9.13 h1:rUEOQouefi9fuVY/2HOroROJlZbOzWYXXeIh41KF2M4= -github.com/filecoin-project/specs-actors v0.9.13/go.mod h1:TS1AW/7LbG+615j4NsjMK1qlpAwaFsG9w0V2tg2gSao= -github.com/filecoin-project/specs-actors/v2 v2.3.5-0.20210114162132-5b58b773f4fb/go.mod h1:LljnY2Mn2homxZsmokJZCpRuhOPxfXhvcek5gWkmqAc= -github.com/filecoin-project/specs-actors/v2 v2.3.6 h1:UxnWTfQd7JsOae39/aHCK0m1IBjdcyymCJfqxuSkn+g= -github.com/filecoin-project/specs-actors/v2 v2.3.6/go.mod h1:DJMpxVRXvev9t8P0XWA26RmTzN+MHiL9IlItVLT0zUc= -github.com/filecoin-project/specs-actors/v3 v3.1.0 h1:s4qiPw8pgypqBGAy853u/zdZJ7K9cTZdM1rTiSonHrg= -github.com/filecoin-project/specs-actors/v3 v3.1.0/go.mod h1:mpynccOLlIRy0QnR008BwYBwT9fen+sPR13MA1VmMww= -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/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/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.4.0 h1:MPIDJYBknPbwBcVf+2/WEIK6LKxhZmfQGCrqKmvhFyU= github.com/filecoin-project/storetheindex v0.4.0/go.mod h1:LIwqpXoKeGxOGEjmxPfdYVPQYoZOSI3oXMUd9XTCpjc= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= @@ -1563,8 +1535,6 @@ github.com/xlab/c-for-go v0.0.0-20201112171043-ea6dce5809cb/go.mod h1:pbNsDSxn1I github.com/xlab/pkgconfig v0.0.0-20170226114623-cea12a0fd245 h1:Sw125DKxZhPUI4JLlWugkzsrlB50jR9v2khiD9FxuSo= github.com/xlab/pkgconfig v0.0.0-20170226114623-cea12a0fd245/go.mod h1:C+diUUz7pxhNY6KAoLgrTYARGWnt82zWTylZlxT92vk= github.com/xorcare/golden v0.6.0/go.mod h1:7T39/ZMvaSEZlBPoYfVFmsBLmUl3uz9IuzWj/U6FtvQ= -github.com/xorcare/golden v0.6.1-0.20191112154924-b87f686d7542 h1:oWgZJmC1DorFZDpfMfWg7xk29yEOZiXmo/wZl+utTI8= -github.com/xorcare/golden v0.6.1-0.20191112154924-b87f686d7542/go.mod h1:7T39/ZMvaSEZlBPoYfVFmsBLmUl3uz9IuzWj/U6FtvQ= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= github.com/ybbus/jsonrpc/v2 v2.1.6/go.mod h1:rIuG1+ORoiqocf9xs/v+ecaAVeo3zcZHQgInyKFMeg0= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= diff --git a/retrievalmarket/impl/clientstates/client_states_test.go b/retrievalmarket/impl/clientstates/client_states_test.go index 028513c52..099b3d98c 100644 --- a/retrievalmarket/impl/clientstates/client_states_test.go +++ b/retrievalmarket/impl/clientstates/client_states_test.go @@ -15,9 +15,9 @@ 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" + "github.com/filecoin-project/go-state-types/builtin/v8/paych" "github.com/filecoin-project/go-statemachine/fsm" fsmtest "github.com/filecoin-project/go-statemachine/fsm/testutil" - "github.com/filecoin-project/specs-actors/actors/builtin/paych" "github.com/filecoin-project/go-fil-markets/retrievalmarket" rm "github.com/filecoin-project/go-fil-markets/retrievalmarket" diff --git a/retrievalmarket/impl/integration_test.go b/retrievalmarket/impl/integration_test.go index 68f902354..679a269d3 100644 --- a/retrievalmarket/impl/integration_test.go +++ b/retrievalmarket/impl/integration_test.go @@ -30,7 +30,7 @@ import ( dtgstransport "github.com/filecoin-project/go-data-transfer/transport/graphsync" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/specs-actors/actors/builtin/paych" + "github.com/filecoin-project/go-state-types/builtin/v8/paych" "github.com/filecoin-project/go-fil-markets/piecestore" "github.com/filecoin-project/go-fil-markets/retrievalmarket" diff --git a/retrievalmarket/impl/provider_test.go b/retrievalmarket/impl/provider_test.go index 87882c5f3..bac7756f2 100644 --- a/retrievalmarket/impl/provider_test.go +++ b/retrievalmarket/impl/provider_test.go @@ -23,7 +23,6 @@ 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/v8/support/testing" "github.com/filecoin-project/go-fil-markets/piecestore" piecemigrations "github.com/filecoin-project/go-fil-markets/piecestore/migrations" @@ -948,7 +947,7 @@ func TestProvider_Construct(t *testing.T) { } _, err := retrievalimpl.NewProvider( - spect.NewIDAddr(t, 2344), + tut.NewIDAddr(t, 2344), node, sa, tut.NewTestRetrievalMarketNetwork(tut.TestNetworkParams{}), @@ -1004,7 +1003,7 @@ func TestProviderConfigOpts(t *testing.T) { } p, err := retrievalimpl.NewProvider( - spect.NewIDAddr(t, 2344), + tut.NewIDAddr(t, 2344), node, sa, tut.NewTestRetrievalMarketNetwork(tut.TestNetworkParams{}), @@ -1025,7 +1024,7 @@ func TestProviderConfigOpts(t *testing.T) { }) p, err = retrievalimpl.NewProvider( - spect.NewIDAddr(t, 2344), + tut.NewIDAddr(t, 2344), testnodes.NewTestRetrievalProviderNode(), testnodes.NewTestSectorAccessor(), tut.NewTestRetrievalMarketNetwork(tut.TestNetworkParams{}), @@ -1186,7 +1185,7 @@ func TestProviderMigrations(t *testing.T) { } retrievalProvider, err := retrievalimpl.NewProvider( - spect.NewIDAddr(t, 2344), + tut.NewIDAddr(t, 2344), node, sa, tut.NewTestRetrievalMarketNetwork(tut.TestNetworkParams{}), diff --git a/retrievalmarket/impl/testnodes/test_retrieval_client_node.go b/retrievalmarket/impl/testnodes/test_retrieval_client_node.go index 1574b5de2..7d13d4da3 100644 --- a/retrievalmarket/impl/testnodes/test_retrieval_client_node.go +++ b/retrievalmarket/impl/testnodes/test_retrieval_client_node.go @@ -13,7 +13,7 @@ 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/actors/builtin/paych" + paychtypes "github.com/filecoin-project/go-state-types/builtin/v8/paych" "github.com/filecoin-project/go-fil-markets/retrievalmarket" "github.com/filecoin-project/go-fil-markets/shared" @@ -29,7 +29,7 @@ type TestRetrievalClientNode struct { createPaychMsgCID, addFundsMsgCID cid.Cid lane uint64 laneError error - voucher *paych.SignedVoucher + voucher *paychtypes.SignedVoucher voucherError, waitErr error channelAvailableFunds retrievalmarket.ChannelAvailableFunds checkAvailableFundsErr error @@ -39,7 +39,7 @@ type TestRetrievalClientNode struct { receivedKnownAddresses map[retrievalmarket.RetrievalPeer]struct{} expectedKnownAddresses map[retrievalmarket.RetrievalPeer]struct{} allocateLaneRecorder func(address.Address) - createPaymentVoucherRecorder func(voucher *paych.SignedVoucher) + createPaymentVoucherRecorder func(voucher *paychtypes.SignedVoucher) getCreatePaymentChannelRecorder func(address.Address, address.Address, abi.TokenAmount) } @@ -50,10 +50,10 @@ type TestRetrievalClientNodeParams struct { CreatePaychCID, AddFundsCID cid.Cid Lane uint64 LaneError error - Voucher *paych.SignedVoucher + Voucher *paychtypes.SignedVoucher VoucherError error AllocateLaneRecorder func(address.Address) - PaymentVoucherRecorder func(voucher *paych.SignedVoucher) + PaymentVoucherRecorder func(voucher *paychtypes.SignedVoucher) PaymentChannelRecorder func(address.Address, address.Address, abi.TokenAmount) AddFundsOnly bool WaitForReadyErr error @@ -113,7 +113,7 @@ func (trcn *TestRetrievalClientNode) AllocateLane(ctx context.Context, paymentCh } // CreatePaymentVoucher creates a mock payment voucher based on a channel and lane -func (trcn *TestRetrievalClientNode) CreatePaymentVoucher(ctx context.Context, paymentChannel address.Address, amount abi.TokenAmount, lane uint64, tok shared.TipSetToken) (*paych.SignedVoucher, error) { +func (trcn *TestRetrievalClientNode) CreatePaymentVoucher(ctx context.Context, paymentChannel address.Address, amount abi.TokenAmount, lane uint64, tok shared.TipSetToken) (*paychtypes.SignedVoucher, error) { if trcn.createPaymentVoucherRecorder != nil { trcn.createPaymentVoucherRecorder(trcn.voucher) } diff --git a/retrievalmarket/impl/testnodes/test_retrieval_provider_node.go b/retrievalmarket/impl/testnodes/test_retrieval_provider_node.go index 686856172..c59176e07 100644 --- a/retrievalmarket/impl/testnodes/test_retrieval_provider_node.go +++ b/retrievalmarket/impl/testnodes/test_retrieval_provider_node.go @@ -16,7 +16,7 @@ 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/actors/builtin/paych" + paychtypes "github.com/filecoin-project/go-state-types/builtin/v8/paych" "github.com/filecoin-project/go-fil-markets/retrievalmarket" "github.com/filecoin-project/go-fil-markets/shared" @@ -93,7 +93,7 @@ func (trpn *TestRetrievalProviderNode) VerifyExpectations(t *testing.T) { func (trpn *TestRetrievalProviderNode) SavePaymentVoucher( ctx context.Context, paymentChannel address.Address, - voucher *paych.SignedVoucher, + voucher *paychtypes.SignedVoucher, proof []byte, expectedAmount abi.TokenAmount, tok shared.TipSetToken) (abi.TokenAmount, error) { @@ -147,7 +147,7 @@ func (trpn *TestRetrievalProviderNode) GetChainHead(ctx context.Context) (shared // --- Non-interface Functions // to ExpectedVoucherKey creates a lookup key for expected vouchers. -func (trpn *TestRetrievalProviderNode) toExpectedVoucherKey(paymentChannel address.Address, voucher *paych.SignedVoucher, proof []byte, expectedAmount abi.TokenAmount) (expectedVoucherKey, error) { +func (trpn *TestRetrievalProviderNode) toExpectedVoucherKey(paymentChannel address.Address, voucher *paychtypes.SignedVoucher, proof []byte, expectedAmount abi.TokenAmount) (expectedVoucherKey, error) { pcString := paymentChannel.String() buf := new(bytes.Buffer) if err := voucher.MarshalCBOR(buf); err != nil { @@ -168,7 +168,7 @@ func (trpn *TestRetrievalProviderNode) toExpectedVoucherKey(paymentChannel addre // expectedErr: an error message to expect func (trpn *TestRetrievalProviderNode) ExpectVoucher( paymentChannel address.Address, - voucher *paych.SignedVoucher, + voucher *paychtypes.SignedVoucher, proof []byte, expectedAmount abi.TokenAmount, actualAmount abi.TokenAmount, // the actual amount it should have (same unless you want to trigger an error) diff --git a/retrievalmarket/migrations/migrations.go b/retrievalmarket/migrations/migrations.go index dd3996a3e..0c8aa7ef0 100644 --- a/retrievalmarket/migrations/migrations.go +++ b/retrievalmarket/migrations/migrations.go @@ -10,7 +10,7 @@ import ( versioning "github.com/filecoin-project/go-ds-versioning/pkg" "github.com/filecoin-project/go-ds-versioning/pkg/versioned" "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/specs-actors/actors/builtin/paych" + paychtypes "github.com/filecoin-project/go-state-types/builtin/v8/paych" "github.com/filecoin-project/go-fil-markets/piecestore" piecemigrations "github.com/filecoin-project/go-fil-markets/piecestore/migrations" @@ -145,7 +145,7 @@ func (dr *DealResponse0) Type() datatransfer.TypeIdentifier { type DealPayment0 struct { ID retrievalmarket.DealID PaymentChannel address.Address - PaymentVoucher *paych.SignedVoucher + PaymentVoucher *paychtypes.SignedVoucher } // Type method makes DealPayment0 usable as a voucher diff --git a/retrievalmarket/migrations/migrations_cbor_gen.go b/retrievalmarket/migrations/migrations_cbor_gen.go index aa88a332b..a9d4d66d1 100644 --- a/retrievalmarket/migrations/migrations_cbor_gen.go +++ b/retrievalmarket/migrations/migrations_cbor_gen.go @@ -10,7 +10,7 @@ import ( migrations "github.com/filecoin-project/go-fil-markets/piecestore/migrations" retrievalmarket "github.com/filecoin-project/go-fil-markets/retrievalmarket" - paych "github.com/filecoin-project/specs-actors/actors/builtin/paych" + paych "github.com/filecoin-project/go-state-types/builtin/v8/paych" cid "github.com/ipfs/go-cid" peer "github.com/libp2p/go-libp2p-core/peer" cbg "github.com/whyrusleeping/cbor-gen" diff --git a/retrievalmarket/migrations/migrations_test.go b/retrievalmarket/migrations/migrations_test.go index 470235178..96a9e46f2 100644 --- a/retrievalmarket/migrations/migrations_test.go +++ b/retrievalmarket/migrations/migrations_test.go @@ -10,12 +10,12 @@ import ( "github.com/libp2p/go-libp2p-core/peer" "github.com/stretchr/testify/require" + "github.com/filecoin-project/go-address" datatransfer "github.com/filecoin-project/go-data-transfer" versionedfsm "github.com/filecoin-project/go-ds-versioning/pkg/fsm" "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/v8/support/testing" "github.com/filecoin-project/go-fil-markets/piecestore/migrations" "github.com/filecoin-project/go-fil-markets/retrievalmarket" @@ -23,6 +23,12 @@ import ( "github.com/filecoin-project/go-fil-markets/retrievalmarket/impl/providerstates" ) +func NewActorAddr(t testing.TB, data string) address.Address { + ret, err := address.NewActorAddress([]byte(data)) + require.NoError(t, err) + return ret +} + func TestClientStateMigration(t *testing.T) { ctx, cancel := context.WithCancel(context.Background()) defer cancel() @@ -43,8 +49,8 @@ func TestClientStateMigration(t *testing.T) { }, }, TotalFunds: abi.NewTokenAmount(0), - ClientWallet: tutils.NewActorAddr(t, "client"), - MinerWallet: tutils.NewActorAddr(t, "miner"), + ClientWallet: NewActorAddr(t, "client"), + MinerWallet: NewActorAddr(t, "miner"), TotalReceived: 0, CurrentInterval: 10, BytesPaidFor: 0, diff --git a/retrievalmarket/nodes.go b/retrievalmarket/nodes.go index 29a2683b1..6cb91c900 100644 --- a/retrievalmarket/nodes.go +++ b/retrievalmarket/nodes.go @@ -8,7 +8,7 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/specs-actors/actors/builtin/paych" + paychtypes "github.com/filecoin-project/go-state-types/builtin/v8/paych" "github.com/filecoin-project/go-fil-markets/shared" ) @@ -34,7 +34,7 @@ type RetrievalClientNode interface { // given payment channel so that all the payment vouchers in the lane add up // to the given amount (so the payment voucher will be for the difference) CreatePaymentVoucher(ctx context.Context, paymentChannel address.Address, amount abi.TokenAmount, - lane uint64, tok shared.TipSetToken) (*paych.SignedVoucher, error) + lane uint64, tok shared.TipSetToken) (*paychtypes.SignedVoucher, error) // WaitForPaymentChannelReady just waits for the payment channel's pending operations to complete WaitForPaymentChannelReady(ctx context.Context, waitSentinel cid.Cid) (address.Address, error) @@ -49,7 +49,7 @@ type RetrievalProviderNode interface { // returns the worker address associated with a miner GetMinerWorkerAddress(ctx context.Context, miner address.Address, tok shared.TipSetToken) (address.Address, error) - SavePaymentVoucher(ctx context.Context, paymentChannel address.Address, voucher *paych.SignedVoucher, proof []byte, expectedAmount abi.TokenAmount, tok shared.TipSetToken) (abi.TokenAmount, error) + SavePaymentVoucher(ctx context.Context, paymentChannel address.Address, voucher *paychtypes.SignedVoucher, proof []byte, expectedAmount abi.TokenAmount, tok shared.TipSetToken) (abi.TokenAmount, error) GetRetrievalPricingInput(ctx context.Context, pieceCID cid.Cid, storageDeals []abi.DealID) (PricingInput, error) } diff --git a/retrievalmarket/storage_retrieval_integration_test.go b/retrievalmarket/storage_retrieval_integration_test.go index 46fea8b66..f08108730 100644 --- a/retrievalmarket/storage_retrieval_integration_test.go +++ b/retrievalmarket/storage_retrieval_integration_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" - "github.com/filecoin-project/specs-actors/actors/builtin/paych" + "github.com/filecoin-project/go-state-types/builtin/v8/paych" "github.com/filecoin-project/go-fil-markets/piecestore" "github.com/filecoin-project/go-fil-markets/retrievalmarket" diff --git a/retrievalmarket/types.go b/retrievalmarket/types.go index 8909a3d6c..301e7628f 100644 --- a/retrievalmarket/types.go +++ b/retrievalmarket/types.go @@ -17,7 +17,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" - "github.com/filecoin-project/specs-actors/actors/builtin/paych" + paychtypes "github.com/filecoin-project/go-state-types/builtin/v8/paych" "github.com/filecoin-project/go-fil-markets/piecestore" ) @@ -356,7 +356,7 @@ var DealResponseUndefined = DealResponse{} type DealPayment struct { ID DealID PaymentChannel address.Address - PaymentVoucher *paych.SignedVoucher + PaymentVoucher *paychtypes.SignedVoucher } // Type method makes DealPayment usable as a voucher diff --git a/retrievalmarket/types_cbor_gen.go b/retrievalmarket/types_cbor_gen.go index 8551dfae6..2fee215aa 100644 --- a/retrievalmarket/types_cbor_gen.go +++ b/retrievalmarket/types_cbor_gen.go @@ -10,7 +10,7 @@ import ( datatransfer "github.com/filecoin-project/go-data-transfer" piecestore "github.com/filecoin-project/go-fil-markets/piecestore" - paych "github.com/filecoin-project/specs-actors/actors/builtin/paych" + paych "github.com/filecoin-project/go-state-types/builtin/v8/paych" cid "github.com/ipfs/go-cid" peer "github.com/libp2p/go-libp2p-core/peer" cbg "github.com/whyrusleeping/cbor-gen" diff --git a/shared_testutil/generators.go b/shared_testutil/generators.go index 993fd7cac..988dbc78f 100644 --- a/shared_testutil/generators.go +++ b/shared_testutil/generators.go @@ -15,9 +15,9 @@ 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" + "github.com/filecoin-project/go-state-types/builtin/v8/market" + "github.com/filecoin-project/go-state-types/builtin/v8/paych" "github.com/filecoin-project/go-state-types/crypto" - "github.com/filecoin-project/specs-actors/actors/builtin/paych" - "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" @@ -27,16 +27,16 @@ import ( // MakeTestSignedVoucher generates a random SignedVoucher that has all non-zero fields func MakeTestSignedVoucher() *paych.SignedVoucher { return &paych.SignedVoucher{ - ChannelAddr: address.TestAddress, - TimeLockMin: abi.ChainEpoch(rand.Int63()), - TimeLockMax: 0, - SecretPreimage: []byte("secret-preimage"), - Extra: MakeTestModVerifyParams(), - Lane: rand.Uint64(), - Nonce: rand.Uint64(), - Amount: MakeTestTokenAmount(), - Merges: []paych.Merge{MakeTestMerge()}, - Signature: MakeTestSignature(), + ChannelAddr: address.TestAddress, + TimeLockMin: abi.ChainEpoch(rand.Int63()), + TimeLockMax: 0, + SecretHash: []byte("secret-preimage"), + Extra: MakeTestModVerifyParams(), + Lane: rand.Uint64(), + Nonce: rand.Uint64(), + Amount: MakeTestTokenAmount(), + Merges: []paych.Merge{MakeTestMerge()}, + Signature: MakeTestSignature(), } } diff --git a/shared_testutil/testutil.go b/shared_testutil/testutil.go index 2fb2c2219..41a4daf31 100644 --- a/shared_testutil/testutil.go +++ b/shared_testutil/testutil.go @@ -16,9 +16,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/filecoin-project/go-address" cborutil "github.com/filecoin-project/go-cbor-util" versioning "github.com/filecoin-project/go-ds-versioning/pkg" - "github.com/filecoin-project/specs-actors/actors/builtin/paych" + "github.com/filecoin-project/go-state-types/builtin/v8/paych" "github.com/filecoin-project/go-fil-markets/retrievalmarket" "github.com/filecoin-project/go-fil-markets/storagemarket" @@ -133,3 +134,9 @@ func DatastoreAtVersion(t *testing.T, ds datastore.Batching, version versioning. require.NoError(t, err) return namespace.Wrap(ds, datastore.NewKey(fmt.Sprintf("/%s", version))) } + +func NewIDAddr(t testing.TB, id uint64) address.Address { + ret, err := address.NewIDAddress(id) + require.NoError(t, err) + return ret +} diff --git a/storagemarket/impl/client.go b/storagemarket/impl/client.go index b221c27a6..933dc9a7d 100644 --- a/storagemarket/impl/client.go +++ b/storagemarket/impl/client.go @@ -19,9 +19,9 @@ import ( versionedfsm "github.com/filecoin-project/go-ds-versioning/pkg/fsm" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" + "github.com/filecoin-project/go-state-types/builtin/v8/market" "github.com/filecoin-project/go-state-types/exitcode" "github.com/filecoin-project/go-statemachine/fsm" - "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" @@ -221,7 +221,7 @@ func (c *Client) GetAsk(ctx context.Context, info storagemarket.StorageProviderI if err != nil { return nil, xerrors.Errorf("failed to open stream to miner: %w", err) } - defer s.Close() //nolint + defer s.Close() //nolint request := network.AskRequest{Miner: info.Address} if err := s.WriteAskRequest(request); err != nil { @@ -270,7 +270,7 @@ func (c *Client) GetProviderDealState(ctx context.Context, proposalCid cid.Cid) if err != nil { return nil, xerrors.Errorf("failed to open stream to miner: %w", err) } - defer s.Close() //nolint + defer s.Close() //nolint buf, err := cborutil.Dump(&deal.ProposalCid) if err != nil { diff --git a/storagemarket/impl/client_test.go b/storagemarket/impl/client_test.go index 1adc8e333..3b990c4e4 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/v8/actors/builtin/market" + "github.com/filecoin-project/go-state-types/builtin/v8/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 dabae7077..e3c999430 100644 --- a/storagemarket/impl/clientstates/client_states_test.go +++ b/storagemarket/impl/clientstates/client_states_test.go @@ -16,10 +16,10 @@ import ( cborutil "github.com/filecoin-project/go-cbor-util" datatransfer "github.com/filecoin-project/go-data-transfer" "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/builtin/v8/market" "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/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 c9c1192fd..2837a77bf 100644 --- a/storagemarket/impl/clientutils/clientutils.go +++ b/storagemarket/impl/clientutils/clientutils.go @@ -15,8 +15,8 @@ import ( cborutil "github.com/filecoin-project/go-cbor-util" "github.com/filecoin-project/go-commp-utils/writer" "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/builtin/v8/market" "github.com/filecoin-project/go-state-types/crypto" - "github.com/filecoin-project/specs-actors/v8/actors/builtin/market" "github.com/filecoin-project/go-fil-markets/shared" "github.com/filecoin-project/go-fil-markets/storagemarket" diff --git a/storagemarket/impl/provider_test.go b/storagemarket/impl/provider_test.go index 58f440a74..1846ba853 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/v8/actors/builtin/market" + "github.com/filecoin-project/go-state-types/builtin/v8/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 01727103d..3f0eb9851 100644 --- a/storagemarket/impl/providerstates/provider_states.go +++ b/storagemarket/impl/providerstates/provider_states.go @@ -15,10 +15,10 @@ 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/go-state-types/builtin/v8/market" + minertypes "github.com/filecoin-project/go-state-types/builtin/v8/miner" "github.com/filecoin-project/go-state-types/exitcode" "github.com/filecoin-project/go-statemachine/fsm" - "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" @@ -113,9 +113,9 @@ func ValidateDealProposal(ctx fsm.Context, environment ProviderDealEnvironment, } // Check that the proposed end epoch isn't too far beyond the current epoch - maxEndEpoch := curEpoch + miner.MaxSectorExpirationExtension + maxEndEpoch := curEpoch + minertypes.MaxSectorExpirationExtension if proposal.EndEpoch > maxEndEpoch { - return ctx.Trigger(storagemarket.ProviderEventDealRejected, xerrors.Errorf("invalid deal end epoch %d: cannot be more than %d past current epoch %d", proposal.EndEpoch, miner.MaxSectorExpirationExtension, curEpoch)) + return ctx.Trigger(storagemarket.ProviderEventDealRejected, xerrors.Errorf("invalid deal end epoch %d: cannot be more than %d past current epoch %d", proposal.EndEpoch, minertypes.MaxSectorExpirationExtension, curEpoch)) } pcMin, pcMax, err := environment.Node().DealProviderCollateralBounds(ctx.Context(), proposal.PieceSize, proposal.VerifiedDeal) diff --git a/storagemarket/impl/providerstates/provider_states_test.go b/storagemarket/impl/providerstates/provider_states_test.go index 9d21d166f..60ad37d05 100644 --- a/storagemarket/impl/providerstates/provider_states_test.go +++ b/storagemarket/impl/providerstates/provider_states_test.go @@ -24,12 +24,12 @@ 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" + "github.com/filecoin-project/go-state-types/builtin" + "github.com/filecoin-project/go-state-types/builtin/v8/market" + "github.com/filecoin-project/go-state-types/builtin/v8/verifreg" "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/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 1c56dbe44..418308426 100644 --- a/storagemarket/impl/providerutils/providerutils.go +++ b/storagemarket/impl/providerutils/providerutils.go @@ -9,8 +9,8 @@ import ( "github.com/filecoin-project/go-address" cborutil "github.com/filecoin-project/go-cbor-util" + "github.com/filecoin-project/go-state-types/builtin/v8/market" "github.com/filecoin-project/go-state-types/crypto" - "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 e012d7e4c..d1561dd78 100644 --- a/storagemarket/impl/providerutils/providerutils_test.go +++ b/storagemarket/impl/providerutils/providerutils_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/require" "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/builtin/v8/market" "github.com/filecoin-project/go-state-types/crypto" - "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 aab3b706b..110f79fa6 100644 --- a/storagemarket/impl/requestvalidation/request_validation_test.go +++ b/storagemarket/impl/requestvalidation/request_validation_test.go @@ -15,9 +15,9 @@ import ( "github.com/filecoin-project/go-address" cborutil "github.com/filecoin-project/go-cbor-util" datatransfer "github.com/filecoin-project/go-data-transfer" + "github.com/filecoin-project/go-state-types/builtin/v8/market" "github.com/filecoin-project/go-state-types/crypto" "github.com/filecoin-project/go-statestore" - "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 528fbd314..87e2be750 100644 --- a/storagemarket/migrations/migrations.go +++ b/storagemarket/migrations/migrations.go @@ -11,8 +11,8 @@ import ( versioning "github.com/filecoin-project/go-ds-versioning/pkg" "github.com/filecoin-project/go-ds-versioning/pkg/versioned" "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/builtin/v8/market" "github.com/filecoin-project/go-state-types/crypto" - "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 04dcecb4e..ecb84b8b0 100644 --- a/storagemarket/migrations/migrations_cbor_gen.go +++ b/storagemarket/migrations/migrations_cbor_gen.go @@ -10,8 +10,8 @@ import ( filestore "github.com/filecoin-project/go-fil-markets/filestore" abi "github.com/filecoin-project/go-state-types/abi" + market "github.com/filecoin-project/go-state-types/builtin/v8/market" crypto "github.com/filecoin-project/go-state-types/crypto" - 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 002a298d3..c29fb1764 100644 --- a/storagemarket/network/types.go +++ b/storagemarket/network/types.go @@ -4,8 +4,8 @@ import ( "github.com/ipfs/go-cid" "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/builtin/v8/market" "github.com/filecoin-project/go-state-types/crypto" - "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 acda775c5..d3ef4ac89 100644 --- a/storagemarket/network/types_cbor_gen.go +++ b/storagemarket/network/types_cbor_gen.go @@ -9,8 +9,8 @@ import ( "sort" storagemarket "github.com/filecoin-project/go-fil-markets/storagemarket" + market "github.com/filecoin-project/go-state-types/builtin/v8/market" crypto "github.com/filecoin-project/go-state-types/crypto" - 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 c6c48609a..2c6a20fc5 100644 --- a/storagemarket/nodes.go +++ b/storagemarket/nodes.go @@ -7,10 +7,10 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/builtin/v8/market" + "github.com/filecoin-project/go-state-types/builtin/v8/verifreg" "github.com/filecoin-project/go-state-types/crypto" "github.com/filecoin-project/go-state-types/exitcode" - "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/testharness/dependencies/dependencies.go b/storagemarket/testharness/dependencies/dependencies.go index e5ab11486..33db6ff2f 100644 --- a/storagemarket/testharness/dependencies/dependencies.go +++ b/storagemarket/testharness/dependencies/dependencies.go @@ -22,7 +22,7 @@ import ( "github.com/filecoin-project/go-data-transfer/testutil" dtgstransport "github.com/filecoin-project/go-data-transfer/transport/graphsync" "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/specs-actors/v7/actors/builtin/market" + "github.com/filecoin-project/go-state-types/builtin/v8/market" discoveryimpl "github.com/filecoin-project/go-fil-markets/discovery/impl" "github.com/filecoin-project/go-fil-markets/filestore" diff --git a/storagemarket/testharness/testharness.go b/storagemarket/testharness/testharness.go index 207b16269..987f2d391 100644 --- a/storagemarket/testharness/testharness.go +++ b/storagemarket/testharness/testharness.go @@ -24,7 +24,7 @@ import ( dtgstransport "github.com/filecoin-project/go-data-transfer/transport/graphsync" "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" + "github.com/filecoin-project/go-state-types/builtin" "github.com/filecoin-project/go-fil-markets/shared_testutil" "github.com/filecoin-project/go-fil-markets/storagemarket" diff --git a/storagemarket/testnodes/testnodes.go b/storagemarket/testnodes/testnodes.go index 4beded994..a52b7b601 100644 --- a/storagemarket/testnodes/testnodes.go +++ b/storagemarket/testnodes/testnodes.go @@ -16,11 +16,11 @@ 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/go-state-types/builtin" + "github.com/filecoin-project/go-state-types/builtin/v8/market" + "github.com/filecoin-project/go-state-types/builtin/v8/verifreg" "github.com/filecoin-project/go-state-types/crypto" "github.com/filecoin-project/go-state-types/exitcode" - "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 4dd3b0686..4d7909bb6 100644 --- a/storagemarket/types.go +++ b/storagemarket/types.go @@ -13,8 +13,8 @@ import ( "github.com/filecoin-project/go-address" datatransfer "github.com/filecoin-project/go-data-transfer" "github.com/filecoin-project/go-state-types/abi" + "github.com/filecoin-project/go-state-types/builtin/v8/market" "github.com/filecoin-project/go-state-types/crypto" - "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 901acfc3f..13c6bb91b 100644 --- a/storagemarket/types_cbor_gen.go +++ b/storagemarket/types_cbor_gen.go @@ -11,8 +11,8 @@ import ( datatransfer "github.com/filecoin-project/go-data-transfer" filestore "github.com/filecoin-project/go-fil-markets/filestore" abi "github.com/filecoin-project/go-state-types/abi" + market "github.com/filecoin-project/go-state-types/builtin/v8/market" crypto "github.com/filecoin-project/go-state-types/crypto" - 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"