Skip to content

Commit

Permalink
Update to new label type in v8 actors
Browse files Browse the repository at this point in the history
  • Loading branch information
@ZenGround0
ZenGround0 committed Apr 7, 2022
1 parent 6ec6b72 commit a8c9eee
Show file tree
Hide file tree
Showing 24 changed files with 38 additions and 30 deletions.
2 changes: 1 addition & 1 deletion discovery/impl/local_test.go
View file
Expand Up @@ -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"
Expand Down
3 changes: 2 additions & 1 deletion go.mod
View file
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions go.sum
View file
Expand Up @@ -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=
Expand Down
2 changes: 1 addition & 1 deletion retrievalmarket/impl/provider_test.go
View file
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion retrievalmarket/migrations/migrations_test.go
View file
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion shared_testutil/generators.go
View file
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion storagemarket/impl/client.go
View file
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion storagemarket/impl/client_test.go
View file
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion storagemarket/impl/clientstates/client_states_test.go
View file
Expand Up @@ -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"
Expand Down
5 changes: 3 additions & 2 deletions storagemarket/impl/clientutils/clientutils.go
View file
Expand Up @@ -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"
Expand Down Expand Up @@ -109,5 +110,5 @@ func LabelField(payloadCID cid.Cid) (market.DealLabel, error) {
return market.EmptyDealLabel, err
}

return market.NewDealLabelFromString(cidStr)
return market.NewLabelFromString(cidStr)
}
2 changes: 1 addition & 1 deletion storagemarket/impl/provider_test.go
View file
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions storagemarket/impl/providerstates/provider_states.go
View file
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions storagemarket/impl/providerstates/provider_states_test.go
View file
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion storagemarket/impl/providerutils/providerutils.go
View file
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion storagemarket/impl/providerutils/providerutils_test.go
View file
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion storagemarket/impl/requestvalidation/request_validation_test.go
View file
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion storagemarket/migrations/migrations.go
View file
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion storagemarket/migrations/migrations_cbor_gen.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion storagemarket/network/types.go
View file
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion storagemarket/network/types_cbor_gen.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions storagemarket/nodes.go
View file
Expand Up @@ -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"
)
Expand Down
6 changes: 3 additions & 3 deletions storagemarket/testnodes/testnodes.go
View file
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion storagemarket/types.go
View file
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion storagemarket/types_cbor_gen.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit a8c9eee

Please sign in to comment.