fixs after rebase

chain/vm/syscalls.go

@@ -103,8 +103,6 @@ func cidToCommR(c cid.Cid) [32]byte {
 func (ss *syscallShim) VerifySeal(info abi.SealVerifyInfo) error {
 	//_, span := trace.StartSpan(ctx, "ValidatePoRep")
 	//defer span.End()
-	// FIXME: sectorSize has been removed from the specs-actors syscall interface but is still required here.
-	ssize := abi.SectorSize(0)
 
 	miner, err := address.NewIDAddress(uint64(info.Miner))
 	if err != nil {

node/impl/paych/paych.go

@@ -7,7 +7,6 @@ import (
 	"github.com/filecoin-project/specs-actors/actors/builtin"
 	"github.com/filecoin-project/specs-actors/actors/builtin/paych"
 	"github.com/ipfs/go-cid"
-	cid "github.com/ipfs/go-cid/_rsrch/cidiface"
 	"go.uber.org/fx"
 	"golang.org/x/xerrors"