Use new go-state-types accessors

Author: arajasek

distributed.go

@@ -1,11 +1,12 @@
-//+build cgo
+//go:build cgo
+// +build cgo
 
 package ffi
 
 import (
 	"github.com/filecoin-project/filecoin-ffi/generated"
 	"github.com/filecoin-project/go-state-types/abi"
-	"github.com/filecoin-project/specs-actors/v5/actors/runtime/proof"
+	"github.com/filecoin-project/go-state-types/builtin/v8/miner"
 	"github.com/pkg/errors"
 )
 
@@ -96,7 +97,7 @@ func GenerateWinningPoStWithVanilla(
 	minerID abi.ActorID,
 	randomness abi.PoStRandomness,
 	proofs [][]byte,
-) ([]proof.PoStProof, error) {
+) ([]miner.PoStProof, error) {
 	pp, err := toFilRegisteredPoStProof(proofType)
 	if err != nil {
 		return nil, err
@@ -138,7 +139,7 @@ func GenerateWindowPoStWithVanilla(
 	minerID abi.ActorID,
 	randomness abi.PoStRandomness,
 	proofs [][]byte,
-) ([]proof.PoStProof, error) {
+) ([]miner.PoStProof, error) {
 	pp, err := toFilRegisteredPoStProof(proofType)
 	if err != nil {
 		return nil, err
@@ -175,7 +176,7 @@ func GenerateWindowPoStWithVanilla(
 	return out, nil
 }
 
-type PartitionProof proof.PoStProof
+type PartitionProof miner.PoStProof
 
 func GenerateSinglePartitionWindowPoStWithVanilla(
 	proofType abi.RegisteredPoStProof,
@@ -228,7 +229,7 @@ func GenerateSinglePartitionWindowPoStWithVanilla(
 func MergeWindowPoStPartitionProofs(
 	proofType abi.RegisteredPoStProof,
 	partitionProofs []PartitionProof,
-) (*proof.PoStProof, error) {
+) (*miner.PoStProof, error) {
 	pp, err := toFilRegisteredPoStProof(proofType)
 	if err != nil {
 		return nil, err
@@ -258,7 +259,7 @@ func MergeWindowPoStPartitionProofs(
 		return nil, err
 	}
 
-	out := proof.PoStProof{
+	out := miner.PoStProof{
 		PoStProof:  dpp,
 		ProofBytes: copyBytes(resp.Proof.ProofPtr, resp.Proof.ProofLen),
 	}

go.mod

@@ -5,10 +5,7 @@ go 1.17
 require (
 	github.com/filecoin-project/go-address v0.0.6
 	github.com/filecoin-project/go-fil-commcid v0.1.0
-	github.com/filecoin-project/go-state-types v0.1.3
-	github.com/filecoin-project/specs-actors v0.9.14
-	github.com/filecoin-project/specs-actors/v5 v5.0.4
-	github.com/filecoin-project/specs-actors/v7 v7.0.0-rc1.0.20220118005651-2470cb39827e
+	github.com/filecoin-project/go-state-types v0.1.4-0.20220422215029-be7db11a85d1
 	github.com/ipfs/go-block-format v0.0.3
 	github.com/ipfs/go-cid v0.1.0
 	github.com/ipfs/go-ipfs-blockstore v1.1.2
@@ -20,15 +17,18 @@ require (
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/filecoin-project/go-amt-ipld/v4 v4.0.0 // indirect
+	github.com/filecoin-project/go-bitfield v0.2.4 // indirect
 	github.com/filecoin-project/go-crypto v0.0.1 // indirect
+	github.com/filecoin-project/go-hamt-ipld/v3 v3.1.0 // indirect
 	github.com/gogo/protobuf v1.3.1 // indirect
 	github.com/google/uuid v1.1.1 // indirect
 	github.com/hashicorp/golang-lru v0.5.4 // indirect
 	github.com/ipfs/bbloom v0.0.4 // indirect
 	github.com/ipfs/go-datastore v0.5.0 // indirect
 	github.com/ipfs/go-ipfs-ds-help v1.1.0 // indirect
 	github.com/ipfs/go-ipfs-util v0.0.2 // indirect
-	github.com/ipfs/go-ipld-cbor v0.0.5 // indirect
+	github.com/ipfs/go-ipld-cbor v0.0.6-0.20211211231443-5d9b9e1f6fa8 // indirect
 	github.com/ipfs/go-ipld-format v0.2.0 // indirect
 	github.com/ipfs/go-log v1.0.4 // indirect
 	github.com/ipfs/go-log/v2 v2.0.5 // indirect
@@ -52,7 +52,7 @@ require (
 	github.com/spaolacci/murmur3 v1.1.0 // indirect
 	github.com/tj/go-spin v1.1.0 // indirect
 	github.com/warpfork/go-wish v0.0.0-20200122115046-b9ea61034e4a // indirect
-	github.com/whyrusleeping/cbor-gen v0.0.0-20210713220151-be142a5ae1a8 // indirect
+	github.com/whyrusleeping/cbor-gen v0.0.0-20220323183124-98fa8256a799 // indirect
 	github.com/xlab/pkgconfig v0.0.0-20170226114623-cea12a0fd245 // indirect
 	go.uber.org/atomic v1.6.0 // indirect
 	go.uber.org/multierr v1.5.0 // indirect