Skip to content

Commit 4975fc5

Browse files
arajasekarajasek
committed
wip
1 parent 8b67cc4 commit 4975fc5

37 files changed

+94
-114
lines changed

‎discovery/impl/local_test.go‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313
"github.com/stretchr/testify/require"
1414

1515
"github.com/filecoin-project/go-address"
16-
specst "github.com/filecoin-project/specs-actors/v8/support/testing"
1716

1817
discoveryimpl "github.com/filecoin-project/go-fil-markets/discovery/impl"
1918
"github.com/filecoin-project/go-fil-markets/discovery/migrations"
@@ -22,16 +21,22 @@ import (
2221
"github.com/filecoin-project/go-fil-markets/shared_testutil"
2322
)
2423

24+
func NewIDAddr(t testing.TB, id uint64) address.Address {
25+
ret, err := address.NewIDAddress(id)
26+
require.NoError(t, err)
27+
return ret
28+
}
29+
2530
func TestLocal_AddPeer(t *testing.T) {
2631
ctx := context.Background()
2732
peer1 := retrievalmarket.RetrievalPeer{
28-
Address: specst.NewIDAddr(t, 1),
33+
Address: NewIDAddr(t, 1),
2934
ID: peer.NewPeerRecord().PeerID,
3035
PieceCID: nil,
3136
}
3237
pieceCid := shared_testutil.GenerateCids(1)[0]
3338
peer2 := retrievalmarket.RetrievalPeer{
34-
Address: specst.NewIDAddr(t, 2),
39+
Address: NewIDAddr(t, 2),
3540
ID: peer.NewPeerRecord().PeerID,
3641
PieceCID: &pieceCid,
3742
}

‎go.mod‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ require (
66
github.com/cespare/xxhash/v2 v2.1.2 // indirect
77
github.com/filecoin-project/dagstore v0.5.2
88
github.com/filecoin-project/go-address v0.0.6
9-
github.com/filecoin-project/go-bitfield v0.2.4 // indirect
109
github.com/filecoin-project/go-cbor-util v0.0.1
1110
github.com/filecoin-project/go-commp-utils v0.1.3
1211
github.com/filecoin-project/go-crypto v0.0.1 // indirect
@@ -15,14 +14,10 @@ require (
1514
github.com/filecoin-project/go-fil-commcid v0.1.0
1615
github.com/filecoin-project/go-fil-commp-hashhash v0.1.0
1716
github.com/filecoin-project/go-padreader v0.0.1
18-
github.com/filecoin-project/go-state-types v0.1.3
17+
github.com/filecoin-project/go-state-types v0.1.6
1918
github.com/filecoin-project/go-statemachine v1.0.2-0.20220322104818-27f8fbb86dfd
2019
github.com/filecoin-project/go-statestore v0.2.0
2120
github.com/filecoin-project/index-provider v0.5.0
22-
github.com/filecoin-project/specs-actors v0.9.13
23-
github.com/filecoin-project/specs-actors/v2 v2.3.6 // indirect
24-
github.com/filecoin-project/specs-actors/v7 v7.0.0
25-
github.com/filecoin-project/specs-actors/v8 v8.0.0-20220407202104-e375a8763a1c
2621
github.com/filecoin-project/storetheindex v0.3.5
2722
github.com/hannahhoward/cbor-gen-for v0.0.0-20200817222906-ea96cece81f1
2823
github.com/hannahhoward/go-pubsub v0.0.0-20200423002714-8d62886cc36e
@@ -61,7 +56,6 @@ require (
6156
github.com/stretchr/testify v1.7.0
6257
github.com/whyrusleeping/cbor v0.0.0-20171005072247-63513f603b11
6358
github.com/whyrusleeping/cbor-gen v0.0.0-20220302191723-37c43cae8e14
64-
github.com/xorcare/golden v0.6.1-0.20191112154924-b87f686d7542 // indirect
6559
golang.org/x/crypto v0.0.0-20211209193657-4570a0811e8b // indirect
6660
golang.org/x/exp v0.0.0-20210715201039-d37aa40e8013
6761
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2

‎go.sum‎

Lines changed: 3 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -206,15 +206,10 @@ github.com/filecoin-project/go-address v0.0.3/go.mod h1:jr8JxKsYx+lQlQZmF5i2U0Z+
206206
github.com/filecoin-project/go-address v0.0.5/go.mod h1:jr8JxKsYx+lQlQZmF5i2U0Z+cGQ59wMIps/8YW/lDj8=
207207
github.com/filecoin-project/go-address v0.0.6 h1:DWQtj38ax+ogHwyH3VULRIoT8E6loyXqsk/p81xoY7M=
208208
github.com/filecoin-project/go-address v0.0.6/go.mod h1:7B0/5DA13n6nHkB8bbGx1gWzG/dbTsZ0fgOJVGsM3TE=
209-
github.com/filecoin-project/go-amt-ipld/v2 v2.1.0 h1:t6qDiuGYYngDqaLc2ZUvdtAg4UNxPeOYaXhBWSNsVaM=
210209
github.com/filecoin-project/go-amt-ipld/v2 v2.1.0/go.mod h1:nfFPoGyX0CU9SkXX8EoCcSuHN1XcbN0c6KBh7yvP5fs=
211-
github.com/filecoin-project/go-amt-ipld/v3 v3.0.0/go.mod h1:Qa95YNAbtoVCTSVtX38aAC1ptBnJfPma1R/zZsKmx4o=
212-
github.com/filecoin-project/go-amt-ipld/v3 v3.1.0 h1:ZNJ9tEG5bE72vBWYiuh5bkxJVM3ViHNOmQ7qew9n6RE=
213-
github.com/filecoin-project/go-amt-ipld/v3 v3.1.0/go.mod h1:UjM2QhDFrrjD5s1CdnkJkat4ga+LqZBZgTMniypABRo=
214210
github.com/filecoin-project/go-amt-ipld/v4 v4.0.0 h1:XM81BJ4/6h3FV0WfFjh74cIDIgqMbJsMBLM0fIuLUUk=
215211
github.com/filecoin-project/go-amt-ipld/v4 v4.0.0/go.mod h1:gF053YQ4BIpzTNDoEwHZas7U3oAwncDVGvOHyY8oDpE=
216212
github.com/filecoin-project/go-bitfield v0.2.0/go.mod h1:CNl9WG8hgR5mttCnUErjcQjGvuiZjRqK9rHVBsQF4oM=
217-
github.com/filecoin-project/go-bitfield v0.2.3/go.mod h1:CNl9WG8hgR5mttCnUErjcQjGvuiZjRqK9rHVBsQF4oM=
218213
github.com/filecoin-project/go-bitfield v0.2.4 h1:uZ7MeE+XfM5lqrHJZ93OnhQKc/rveW8p9au0C68JPgk=
219214
github.com/filecoin-project/go-bitfield v0.2.4/go.mod h1:CNl9WG8hgR5mttCnUErjcQjGvuiZjRqK9rHVBsQF4oM=
220215
github.com/filecoin-project/go-cbor-util v0.0.0-20191219014500-08c40a1e63a2/go.mod h1:pqTiPHobNkOVM5thSRsHYjyQfq7O5QSCMhvuu9JoDlg=
@@ -237,11 +232,6 @@ github.com/filecoin-project/go-fil-commcid v0.1.0 h1:3R4ds1A9r6cr8mvZBfMYxTS88Oq
237232
github.com/filecoin-project/go-fil-commcid v0.1.0/go.mod h1:Eaox7Hvus1JgPrL5+M3+h7aSPHc0cVqpSxA+TxIEpZQ=
238233
github.com/filecoin-project/go-fil-commp-hashhash v0.1.0 h1:imrrpZWEHRnNqqv0tN7LXep5bFEVOVmQWHJvl2mgsGo=
239234
github.com/filecoin-project/go-fil-commp-hashhash v0.1.0/go.mod h1:73S8WSEWh9vr0fDJVnKADhfIv/d6dCbAGaAGWbdJEI8=
240-
github.com/filecoin-project/go-hamt-ipld v0.1.5 h1:uoXrKbCQZ49OHpsTCkrThPNelC4W3LPEk0OrS/ytIBM=
241-
github.com/filecoin-project/go-hamt-ipld v0.1.5/go.mod h1:6Is+ONR5Cd5R6XZoCse1CWaXZc0Hdb/JeX+EQCQzX24=
242-
github.com/filecoin-project/go-hamt-ipld/v2 v2.0.0 h1:b3UDemBYN2HNfk3KOXNuxgTTxlWi3xVvbQP0IT38fvM=
243-
github.com/filecoin-project/go-hamt-ipld/v2 v2.0.0/go.mod h1:7aWZdaQ1b16BVoQUYR+eEvrDCGJoPLxFpDynFjYfBjI=
244-
github.com/filecoin-project/go-hamt-ipld/v3 v3.0.1/go.mod h1:gXpNmr3oQx8l3o7qkGyDjJjYSRX7hp/FGOStdqrWyDI=
245235
github.com/filecoin-project/go-hamt-ipld/v3 v3.1.0 h1:rVVNq0x6RGQIzCo1iiJlGFm9AGIZzeifggxtKMU7zmI=
246236
github.com/filecoin-project/go-hamt-ipld/v3 v3.1.0/go.mod h1:bxmzgT8tmeVQA1/gvBwFmYdT8SOFUwB3ovSUfG1Ux0g=
247237
github.com/filecoin-project/go-indexer-core v0.2.8/go.mod h1:IagNfTdFuX4057kla43PjRCn3yBuUiZgIxuA0hTUamY=
@@ -252,12 +242,10 @@ github.com/filecoin-project/go-padreader v0.0.1 h1:8h2tVy5HpoNbr2gBRr+WD6zV6VD6X
252242
github.com/filecoin-project/go-padreader v0.0.1/go.mod h1:VYVPJqwpsfmtoHnAmPx6MUwmrK6HIcDqZJiuZhtmfLQ=
253243
github.com/filecoin-project/go-state-types v0.0.0-20200903145444-247639ffa6ad/go.mod h1:IQ0MBPnonv35CJHtWSN3YY1Hz2gkPru1Q9qoaYLxx9I=
254244
github.com/filecoin-project/go-state-types v0.0.0-20200904021452-1883f36ca2f4/go.mod h1:IQ0MBPnonv35CJHtWSN3YY1Hz2gkPru1Q9qoaYLxx9I=
255-
github.com/filecoin-project/go-state-types v0.0.0-20200928172055-2df22083d8ab/go.mod h1:ezYnPf0bNkTsDibL/psSz5dy4B5awOJ/E7P2Saeep8g=
256245
github.com/filecoin-project/go-state-types v0.0.0-20201102161440-c8033295a1fc/go.mod h1:ezYnPf0bNkTsDibL/psSz5dy4B5awOJ/E7P2Saeep8g=
257246
github.com/filecoin-project/go-state-types v0.1.0/go.mod h1:ezYnPf0bNkTsDibL/psSz5dy4B5awOJ/E7P2Saeep8g=
258-
github.com/filecoin-project/go-state-types v0.1.1-0.20210810190654-139e0e79e69e/go.mod h1:ezYnPf0bNkTsDibL/psSz5dy4B5awOJ/E7P2Saeep8g=
259-
github.com/filecoin-project/go-state-types v0.1.3 h1:rzIJyQo5HO2ptc8Jcu8P0qTutnI7NWwTle54eAHoNO0=
260-
github.com/filecoin-project/go-state-types v0.1.3/go.mod h1:ezYnPf0bNkTsDibL/psSz5dy4B5awOJ/E7P2Saeep8g=
247+
github.com/filecoin-project/go-state-types v0.1.6 h1:xDDYt188auutDP7miWceT8H7woW9EgunkM+EEm0mCLg=
248+
github.com/filecoin-project/go-state-types v0.1.6/go.mod h1:UwGVoMsULoCK+bWjEdd/xLCvLAQFBC7EDT477SKml+Q=
261249
github.com/filecoin-project/go-statemachine v0.0.0-20200925024713-05bd7c71fbfe/go.mod h1:FGwQgZAt2Gh5mjlwJUlVB62JeYdo+if0xWxSEfBD9ig=
262250
github.com/filecoin-project/go-statemachine v1.0.2-0.20220322104818-27f8fbb86dfd h1:Ykxbz+LvSCUIl2zFaaPGmF8KHXTJu9T/PymgHr7IHjs=
263251
github.com/filecoin-project/go-statemachine v1.0.2-0.20220322104818-27f8fbb86dfd/go.mod h1:jZdXXiHa61n4NmgWFG4w8tnqgvZVHYbJ3yW7+y8bF54=
@@ -266,24 +254,8 @@ github.com/filecoin-project/go-statestore v0.2.0 h1:cRRO0aPLrxKQCZ2UOQbzFGn4WDNd
266254
github.com/filecoin-project/go-statestore v0.2.0/go.mod h1:8sjBYbS35HwPzct7iT4lIXjLlYyPor80aU7t7a/Kspo=
267255
github.com/filecoin-project/index-provider v0.5.0 h1:k2C1RFvOvxmA2i8bhmkb3b4qun7RDRDzzs/y25/TwQg=
268256
github.com/filecoin-project/index-provider v0.5.0/go.mod h1:KHVrP2vU3YuScb+fawObwTFoR882up9U07kk0ZrfP0c=
257+
github.com/filecoin-project/specs-actors v0.9.4 h1:FePB+hrctHHiTbmaY4hnvBJzfgckN3eJreUZWpS5yks=
269258
github.com/filecoin-project/specs-actors v0.9.4/go.mod h1:BStZQzx5x7TmCkLv0Bpa07U6cPKol6fd3w9KjMPZ6Z4=
270-
github.com/filecoin-project/specs-actors v0.9.13 h1:rUEOQouefi9fuVY/2HOroROJlZbOzWYXXeIh41KF2M4=
271-
github.com/filecoin-project/specs-actors v0.9.13/go.mod h1:TS1AW/7LbG+615j4NsjMK1qlpAwaFsG9w0V2tg2gSao=
272-
github.com/filecoin-project/specs-actors/v2 v2.3.5-0.20210114162132-5b58b773f4fb/go.mod h1:LljnY2Mn2homxZsmokJZCpRuhOPxfXhvcek5gWkmqAc=
273-
github.com/filecoin-project/specs-actors/v2 v2.3.6 h1:UxnWTfQd7JsOae39/aHCK0m1IBjdcyymCJfqxuSkn+g=
274-
github.com/filecoin-project/specs-actors/v2 v2.3.6/go.mod h1:DJMpxVRXvev9t8P0XWA26RmTzN+MHiL9IlItVLT0zUc=
275-
github.com/filecoin-project/specs-actors/v3 v3.1.0 h1:s4qiPw8pgypqBGAy853u/zdZJ7K9cTZdM1rTiSonHrg=
276-
github.com/filecoin-project/specs-actors/v3 v3.1.0/go.mod h1:mpynccOLlIRy0QnR008BwYBwT9fen+sPR13MA1VmMww=
277-
github.com/filecoin-project/specs-actors/v4 v4.0.0/go.mod h1:TkHXf/l7Wyw4ZejyXIPS2rK8bBO0rdwhTZyQQgaglng=
278-
github.com/filecoin-project/specs-actors/v5 v5.0.4 h1:OY7BdxJWlUfUFXWV/kpNBYGXNPasDIedf42T3sGx08s=
279-
github.com/filecoin-project/specs-actors/v5 v5.0.4/go.mod h1:5BAKRAMsOOlD8+qCw4UvT/lTLInCJ3JwOWZbX8Ipwq4=
280-
github.com/filecoin-project/specs-actors/v6 v6.0.0/go.mod h1:V1AYfi5GkHXipx1mnVivoICZh3wtwPxDVuds+fbfQtk=
281-
github.com/filecoin-project/specs-actors/v6 v6.0.1 h1:laxvHNsvrq83Y9n+W7znVCePi3oLyRf0Rkl4jFO8Wew=
282-
github.com/filecoin-project/specs-actors/v6 v6.0.1/go.mod h1:V1AYfi5GkHXipx1mnVivoICZh3wtwPxDVuds+fbfQtk=
283-
github.com/filecoin-project/specs-actors/v7 v7.0.0 h1:FQN7tjt3o68hfb3qLFSJBoLMuOFY0REkFVLO/zXj8RU=
284-
github.com/filecoin-project/specs-actors/v7 v7.0.0/go.mod h1:TA5FwCna+Yi36POaT7SLKXsgEDvJwc0V/L6ZsO19B9M=
285-
github.com/filecoin-project/specs-actors/v8 v8.0.0-20220407202104-e375a8763a1c h1:WdAk1RfDBOhypv+tFzdonzk3jjQIfk2FJBZdRyFrLN4=
286-
github.com/filecoin-project/specs-actors/v8 v8.0.0-20220407202104-e375a8763a1c/go.mod h1:UYIPg65iPWoFw5NEftREdJwv9b/5yaLKdCgTvNI/2FA=
287259
github.com/filecoin-project/storetheindex v0.3.5 h1:KoS9TvjPm6zIZfUH8atAHJbVHOO7GTP1MdTG+v0eE+Q=
288260
github.com/filecoin-project/storetheindex v0.3.5/go.mod h1:0r3d0kSpK63O6AvLr1CjAINLi+nWD49clzcnKV+GLpI=
289261
github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
@@ -1556,8 +1528,6 @@ github.com/xlab/c-for-go v0.0.0-20201112171043-ea6dce5809cb/go.mod h1:pbNsDSxn1I
15561528
github.com/xlab/pkgconfig v0.0.0-20170226114623-cea12a0fd245 h1:Sw125DKxZhPUI4JLlWugkzsrlB50jR9v2khiD9FxuSo=
15571529
github.com/xlab/pkgconfig v0.0.0-20170226114623-cea12a0fd245/go.mod h1:C+diUUz7pxhNY6KAoLgrTYARGWnt82zWTylZlxT92vk=
15581530
github.com/xorcare/golden v0.6.0/go.mod h1:7T39/ZMvaSEZlBPoYfVFmsBLmUl3uz9IuzWj/U6FtvQ=
1559-
github.com/xorcare/golden v0.6.1-0.20191112154924-b87f686d7542 h1:oWgZJmC1DorFZDpfMfWg7xk29yEOZiXmo/wZl+utTI8=
1560-
github.com/xorcare/golden v0.6.1-0.20191112154924-b87f686d7542/go.mod h1:7T39/ZMvaSEZlBPoYfVFmsBLmUl3uz9IuzWj/U6FtvQ=
15611531
github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
15621532
github.com/ybbus/jsonrpc/v2 v2.1.6/go.mod h1:rIuG1+ORoiqocf9xs/v+ecaAVeo3zcZHQgInyKFMeg0=
15631533
github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

‎retrievalmarket/impl/clientstates/client_states_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ import (
1515
datatransfer "github.com/filecoin-project/go-data-transfer"
1616
"github.com/filecoin-project/go-state-types/abi"
1717
"github.com/filecoin-project/go-state-types/big"
18+
"github.com/filecoin-project/go-state-types/builtin/v8/paych"
1819
"github.com/filecoin-project/go-statemachine/fsm"
1920
fsmtest "github.com/filecoin-project/go-statemachine/fsm/testutil"
20-
"github.com/filecoin-project/specs-actors/actors/builtin/paych"
2121

2222
"github.com/filecoin-project/go-fil-markets/retrievalmarket"
2323
rm "github.com/filecoin-project/go-fil-markets/retrievalmarket"

‎retrievalmarket/impl/integration_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
dtgstransport "github.com/filecoin-project/go-data-transfer/transport/graphsync"
3131
"github.com/filecoin-project/go-state-types/abi"
3232
"github.com/filecoin-project/go-state-types/big"
33-
"github.com/filecoin-project/specs-actors/actors/builtin/paych"
33+
"github.com/filecoin-project/go-state-types/builtin/v8/paych"
3434

3535
"github.com/filecoin-project/go-fil-markets/piecestore"
3636
"github.com/filecoin-project/go-fil-markets/retrievalmarket"

‎retrievalmarket/impl/provider_test.go‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import (
2323
datatransfer "github.com/filecoin-project/go-data-transfer"
2424
"github.com/filecoin-project/go-state-types/abi"
2525
"github.com/filecoin-project/go-state-types/big"
26-
spect "github.com/filecoin-project/specs-actors/v8/support/testing"
2726

2827
"github.com/filecoin-project/go-fil-markets/piecestore"
2928
piecemigrations "github.com/filecoin-project/go-fil-markets/piecestore/migrations"
@@ -932,6 +931,12 @@ func TestHandleQueryStream(t *testing.T) {
932931

933932
}
934933

934+
func NewIDAddr(t testing.TB, id uint64) address.Address {
935+
ret, err := address.NewIDAddress(id)
936+
require.NoError(t, err)
937+
return ret
938+
}
939+
935940
func TestProvider_Construct(t *testing.T) {
936941
ds := datastore.NewMapDatastore()
937942
pieceStore := tut.NewTestPieceStore()
@@ -946,7 +951,7 @@ func TestProvider_Construct(t *testing.T) {
946951
}
947952

948953
_, err := retrievalimpl.NewProvider(
949-
spect.NewIDAddr(t, 2344),
954+
NewIDAddr(t, 2344),
950955
node,
951956
sa,
952957
tut.NewTestRetrievalMarketNetwork(tut.TestNetworkParams{}),
@@ -1002,7 +1007,7 @@ func TestProviderConfigOpts(t *testing.T) {
10021007
}
10031008

10041009
p, err := retrievalimpl.NewProvider(
1005-
spect.NewIDAddr(t, 2344),
1010+
NewIDAddr(t, 2344),
10061011
node,
10071012
sa,
10081013
tut.NewTestRetrievalMarketNetwork(tut.TestNetworkParams{}),
@@ -1023,7 +1028,7 @@ func TestProviderConfigOpts(t *testing.T) {
10231028
})
10241029

10251030
p, err = retrievalimpl.NewProvider(
1026-
spect.NewIDAddr(t, 2344),
1031+
NewIDAddr(t, 2344),
10271032
testnodes.NewTestRetrievalProviderNode(),
10281033
testnodes.NewTestSectorAccessor(),
10291034
tut.NewTestRetrievalMarketNetwork(tut.TestNetworkParams{}),
@@ -1184,7 +1189,7 @@ func TestProviderMigrations(t *testing.T) {
11841189
}
11851190

11861191
retrievalProvider, err := retrievalimpl.NewProvider(
1187-
spect.NewIDAddr(t, 2344),
1192+
NewIDAddr(t, 2344),
11881193
node,
11891194
sa,
11901195
tut.NewTestRetrievalMarketNetwork(tut.TestNetworkParams{}),

‎retrievalmarket/impl/testnodes/test_retrieval_client_node.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"github.com/filecoin-project/go-address"
1414
"github.com/filecoin-project/go-state-types/abi"
1515
"github.com/filecoin-project/go-state-types/big"
16-
"github.com/filecoin-project/specs-actors/actors/builtin/paych"
16+
paychtypes "github.com/filecoin-project/go-state-types/builtin/v8/paych"
1717

1818
"github.com/filecoin-project/go-fil-markets/retrievalmarket"
1919
"github.com/filecoin-project/go-fil-markets/shared"
@@ -29,7 +29,7 @@ type TestRetrievalClientNode struct {
2929
createPaychMsgCID, addFundsMsgCID cid.Cid
3030
lane uint64
3131
laneError error
32-
voucher *paych.SignedVoucher
32+
voucher *paychtypes.SignedVoucher
3333
voucherError, waitErr error
3434
channelAvailableFunds retrievalmarket.ChannelAvailableFunds
3535
checkAvailableFundsErr error
@@ -39,7 +39,7 @@ type TestRetrievalClientNode struct {
3939
receivedKnownAddresses map[retrievalmarket.RetrievalPeer]struct{}
4040
expectedKnownAddresses map[retrievalmarket.RetrievalPeer]struct{}
4141
allocateLaneRecorder func(address.Address)
42-
createPaymentVoucherRecorder func(voucher *paych.SignedVoucher)
42+
createPaymentVoucherRecorder func(voucher *paychtypes.SignedVoucher)
4343
getCreatePaymentChannelRecorder func(address.Address, address.Address, abi.TokenAmount)
4444
}
4545

@@ -50,10 +50,10 @@ type TestRetrievalClientNodeParams struct {
5050
CreatePaychCID, AddFundsCID cid.Cid
5151
Lane uint64
5252
LaneError error
53-
Voucher *paych.SignedVoucher
53+
Voucher *paychtypes.SignedVoucher
5454
VoucherError error
5555
AllocateLaneRecorder func(address.Address)
56-
PaymentVoucherRecorder func(voucher *paych.SignedVoucher)
56+
PaymentVoucherRecorder func(voucher *paychtypes.SignedVoucher)
5757
PaymentChannelRecorder func(address.Address, address.Address, abi.TokenAmount)
5858
AddFundsOnly bool
5959
WaitForReadyErr error
@@ -113,7 +113,7 @@ func (trcn *TestRetrievalClientNode) AllocateLane(ctx context.Context, paymentCh
113113
}
114114

115115
// CreatePaymentVoucher creates a mock payment voucher based on a channel and lane
116-
func (trcn *TestRetrievalClientNode) CreatePaymentVoucher(ctx context.Context, paymentChannel address.Address, amount abi.TokenAmount, lane uint64, tok shared.TipSetToken) (*paych.SignedVoucher, error) {
116+
func (trcn *TestRetrievalClientNode) CreatePaymentVoucher(ctx context.Context, paymentChannel address.Address, amount abi.TokenAmount, lane uint64, tok shared.TipSetToken) (*paychtypes.SignedVoucher, error) {
117117
if trcn.createPaymentVoucherRecorder != nil {
118118
trcn.createPaymentVoucherRecorder(trcn.voucher)
119119
}

‎retrievalmarket/impl/testnodes/test_retrieval_provider_node.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"github.com/filecoin-project/go-address"
1717
"github.com/filecoin-project/go-state-types/abi"
1818
"github.com/filecoin-project/go-state-types/big"
19-
"github.com/filecoin-project/specs-actors/actors/builtin/paych"
19+
paychtypes "github.com/filecoin-project/go-state-types/builtin/v8/paych"
2020

2121
"github.com/filecoin-project/go-fil-markets/retrievalmarket"
2222
"github.com/filecoin-project/go-fil-markets/shared"
@@ -93,7 +93,7 @@ func (trpn *TestRetrievalProviderNode) VerifyExpectations(t *testing.T) {
9393
func (trpn *TestRetrievalProviderNode) SavePaymentVoucher(
9494
ctx context.Context,
9595
paymentChannel address.Address,
96-
voucher *paych.SignedVoucher,
96+
voucher *paychtypes.SignedVoucher,
9797
proof []byte,
9898
expectedAmount abi.TokenAmount,
9999
tok shared.TipSetToken) (abi.TokenAmount, error) {
@@ -147,7 +147,7 @@ func (trpn *TestRetrievalProviderNode) GetChainHead(ctx context.Context) (shared
147147
// --- Non-interface Functions
148148

149149
// to ExpectedVoucherKey creates a lookup key for expected vouchers.
150-
func (trpn *TestRetrievalProviderNode) toExpectedVoucherKey(paymentChannel address.Address, voucher *paych.SignedVoucher, proof []byte, expectedAmount abi.TokenAmount) (expectedVoucherKey, error) {
150+
func (trpn *TestRetrievalProviderNode) toExpectedVoucherKey(paymentChannel address.Address, voucher *paychtypes.SignedVoucher, proof []byte, expectedAmount abi.TokenAmount) (expectedVoucherKey, error) {
151151
pcString := paymentChannel.String()
152152
buf := new(bytes.Buffer)
153153
if err := voucher.MarshalCBOR(buf); err != nil {
@@ -168,7 +168,7 @@ func (trpn *TestRetrievalProviderNode) toExpectedVoucherKey(paymentChannel addre
168168
// expectedErr: an error message to expect
169169
func (trpn *TestRetrievalProviderNode) ExpectVoucher(
170170
paymentChannel address.Address,
171-
voucher *paych.SignedVoucher,
171+
voucher *paychtypes.SignedVoucher,
172172
proof []byte,
173173
expectedAmount abi.TokenAmount,
174174
actualAmount abi.TokenAmount, // the actual amount it should have (same unless you want to trigger an error)

‎retrievalmarket/migrations/migrations.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
versioning "github.com/filecoin-project/go-ds-versioning/pkg"
1111
"github.com/filecoin-project/go-ds-versioning/pkg/versioned"
1212
"github.com/filecoin-project/go-state-types/abi"
13-
"github.com/filecoin-project/specs-actors/actors/builtin/paych"
13+
paychtypes "github.com/filecoin-project/go-state-types/builtin/v8/paych"
1414

1515
"github.com/filecoin-project/go-fil-markets/piecestore"
1616
piecemigrations "github.com/filecoin-project/go-fil-markets/piecestore/migrations"
@@ -145,7 +145,7 @@ func (dr *DealResponse0) Type() datatransfer.TypeIdentifier {
145145
type DealPayment0 struct {
146146
ID retrievalmarket.DealID
147147
PaymentChannel address.Address
148-
PaymentVoucher *paych.SignedVoucher
148+
PaymentVoucher *paychtypes.SignedVoucher
149149
}
150150

151151
// Type method makes DealPayment0 usable as a voucher

‎retrievalmarket/migrations/migrations_cbor_gen.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)