diff --git a/.circleci/config.yml b/.circleci/config.yml index 80e7b83e869..52a37a59fa3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -992,7 +992,7 @@ workflows: - test: go-test-flags: "-run=TestMulticoreSDR" suite: multicore-sdr-check - target: "./extern/sealer/ffiwrapper" + target: "./storage/sealer/ffiwrapper" proofs-log-test: "1" - test-conformance: suite: conformance diff --git a/.circleci/template.yml b/.circleci/template.yml index 898cfd2debf..482eb72bf93 100644 --- a/.circleci/template.yml +++ b/.circleci/template.yml @@ -782,7 +782,7 @@ workflows: - test: go-test-flags: "-run=TestMulticoreSDR" suite: multicore-sdr-check - target: "./extern/sealer/ffiwrapper" + target: "./storage/sealer/ffiwrapper" proofs-log-test: "1" - test-conformance: suite: conformance diff --git a/gen/main.go b/gen/main.go index 5fac3adcf15..fcb1d6dfa98 100644 --- a/gen/main.go +++ b/gen/main.go @@ -99,7 +99,7 @@ func main() { os.Exit(1) } - err = gen.WriteMapEncodersToFile("./extern/sealer/storiface/cbor_gen.go", "storiface", + err = gen.WriteMapEncodersToFile("./storage/sealer/storiface/cbor_gen.go", "storiface", storiface.CallID{}, ) if err != nil { @@ -107,7 +107,7 @@ func main() { os.Exit(1) } - err = gen.WriteMapEncodersToFile("./extern/sealer/cbor_gen.go", "sealer", + err = gen.WriteMapEncodersToFile("./storage/sealer/cbor_gen.go", "sealer", sectorstorage.Call{}, sectorstorage.WorkState{}, sectorstorage.WorkID{}, diff --git a/node/config/doc_gen.go b/node/config/doc_gen.go index c3fed5197b0..68d81f80273 100644 --- a/node/config/doc_gen.go +++ b/node/config/doc_gen.go @@ -782,7 +782,7 @@ If you see stuck Finalize tasks after enabling this setting, check }, { Name: "ResourceFiltering", - Type: "sectorstorage.ResourceFilteringStrategy", + Type: "sealer.ResourceFilteringStrategy", Comment: `ResourceFiltering instructs the system which resource filtering strategy to use when evaluating tasks against this worker. An empty value defaults diff --git a/storage/pipeline/mocks/api.go b/storage/pipeline/mocks/api.go index 4a10068f533..0f04688e54c 100644 --- a/storage/pipeline/mocks/api.go +++ b/storage/pipeline/mocks/api.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/filecoin-project/lotus/extern/pipeline (interfaces: SealingAPI) +// Source: github.com/filecoin-project/lotus/storage/pipeline (interfaces: SealingAPI) // Package mocks is a generated GoMock package. package mocks @@ -23,7 +23,7 @@ import ( api "github.com/filecoin-project/lotus/api" types "github.com/filecoin-project/lotus/chain/types" - sealing2 "github.com/filecoin-project/lotus/storage/pipeline" + sealing "github.com/filecoin-project/lotus/storage/pipeline" ) // MockSealingAPI is a mock of SealingAPI interface. @@ -50,7 +50,7 @@ func (m *MockSealingAPI) EXPECT() *MockSealingAPIMockRecorder { } // ChainBaseFee mocks base method. -func (m *MockSealingAPI) ChainBaseFee(arg0 context.Context, arg1 sealing2.TipSetToken) (big.Int, error) { +func (m *MockSealingAPI) ChainBaseFee(arg0 context.Context, arg1 sealing.TipSetToken) (big.Int, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "ChainBaseFee", arg0, arg1) ret0, _ := ret[0].(big.Int) @@ -80,10 +80,10 @@ func (mr *MockSealingAPIMockRecorder) ChainGetMessage(arg0, arg1 interface{}) *g } // ChainHead mocks base method. -func (m *MockSealingAPI) ChainHead(arg0 context.Context) (sealing2.TipSetToken, abi.ChainEpoch, error) { +func (m *MockSealingAPI) ChainHead(arg0 context.Context) (sealing.TipSetToken, abi.ChainEpoch, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "ChainHead", arg0) - ret0, _ := ret[0].(sealing2.TipSetToken) + ret0, _ := ret[0].(sealing.TipSetToken) ret1, _ := ret[1].(abi.ChainEpoch) ret2, _ := ret[2].(error) return ret0, ret1, ret2 @@ -126,7 +126,7 @@ func (mr *MockSealingAPIMockRecorder) SendMsg(arg0, arg1, arg2, arg3, arg4, arg5 } // StateComputeDataCommitment mocks base method. -func (m *MockSealingAPI) StateComputeDataCommitment(arg0 context.Context, arg1 address.Address, arg2 abi.RegisteredSealProof, arg3 []abi.DealID, arg4 sealing2.TipSetToken) (cid.Cid, error) { +func (m *MockSealingAPI) StateComputeDataCommitment(arg0 context.Context, arg1 address.Address, arg2 abi.RegisteredSealProof, arg3 []abi.DealID, arg4 sealing.TipSetToken) (cid.Cid, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "StateComputeDataCommitment", arg0, arg1, arg2, arg3, arg4) ret0, _ := ret[0].(cid.Cid) @@ -141,7 +141,7 @@ func (mr *MockSealingAPIMockRecorder) StateComputeDataCommitment(arg0, arg1, arg } // StateGetRandomnessFromBeacon mocks base method. -func (m *MockSealingAPI) StateGetRandomnessFromBeacon(arg0 context.Context, arg1 crypto.DomainSeparationTag, arg2 abi.ChainEpoch, arg3 []byte, arg4 sealing2.TipSetToken) (abi.Randomness, error) { +func (m *MockSealingAPI) StateGetRandomnessFromBeacon(arg0 context.Context, arg1 crypto.DomainSeparationTag, arg2 abi.ChainEpoch, arg3 []byte, arg4 sealing.TipSetToken) (abi.Randomness, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "StateGetRandomnessFromBeacon", arg0, arg1, arg2, arg3, arg4) ret0, _ := ret[0].(abi.Randomness) @@ -156,7 +156,7 @@ func (mr *MockSealingAPIMockRecorder) StateGetRandomnessFromBeacon(arg0, arg1, a } // StateGetRandomnessFromTickets mocks base method. -func (m *MockSealingAPI) StateGetRandomnessFromTickets(arg0 context.Context, arg1 crypto.DomainSeparationTag, arg2 abi.ChainEpoch, arg3 []byte, arg4 sealing2.TipSetToken) (abi.Randomness, error) { +func (m *MockSealingAPI) StateGetRandomnessFromTickets(arg0 context.Context, arg1 crypto.DomainSeparationTag, arg2 abi.ChainEpoch, arg3 []byte, arg4 sealing.TipSetToken) (abi.Randomness, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "StateGetRandomnessFromTickets", arg0, arg1, arg2, arg3, arg4) ret0, _ := ret[0].(abi.Randomness) @@ -171,7 +171,7 @@ func (mr *MockSealingAPIMockRecorder) StateGetRandomnessFromTickets(arg0, arg1, } // StateLookupID mocks base method. -func (m *MockSealingAPI) StateLookupID(arg0 context.Context, arg1 address.Address, arg2 sealing2.TipSetToken) (address.Address, error) { +func (m *MockSealingAPI) StateLookupID(arg0 context.Context, arg1 address.Address, arg2 sealing.TipSetToken) (address.Address, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "StateLookupID", arg0, arg1, arg2) ret0, _ := ret[0].(address.Address) @@ -186,7 +186,7 @@ func (mr *MockSealingAPIMockRecorder) StateLookupID(arg0, arg1, arg2 interface{} } // StateMarketStorageDeal mocks base method. -func (m *MockSealingAPI) StateMarketStorageDeal(arg0 context.Context, arg1 abi.DealID, arg2 sealing2.TipSetToken) (*api.MarketDeal, error) { +func (m *MockSealingAPI) StateMarketStorageDeal(arg0 context.Context, arg1 abi.DealID, arg2 sealing.TipSetToken) (*api.MarketDeal, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "StateMarketStorageDeal", arg0, arg1, arg2) ret0, _ := ret[0].(*api.MarketDeal) @@ -201,7 +201,7 @@ func (mr *MockSealingAPIMockRecorder) StateMarketStorageDeal(arg0, arg1, arg2 in } // StateMarketStorageDealProposal mocks base method. -func (m *MockSealingAPI) StateMarketStorageDealProposal(arg0 context.Context, arg1 abi.DealID, arg2 sealing2.TipSetToken) (market.DealProposal, error) { +func (m *MockSealingAPI) StateMarketStorageDealProposal(arg0 context.Context, arg1 abi.DealID, arg2 sealing.TipSetToken) (market.DealProposal, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "StateMarketStorageDealProposal", arg0, arg1, arg2) ret0, _ := ret[0].(market.DealProposal) @@ -216,7 +216,7 @@ func (mr *MockSealingAPIMockRecorder) StateMarketStorageDealProposal(arg0, arg1, } // StateMinerActiveSectors mocks base method. -func (m *MockSealingAPI) StateMinerActiveSectors(arg0 context.Context, arg1 address.Address, arg2 sealing2.TipSetToken) (bitfield.BitField, error) { +func (m *MockSealingAPI) StateMinerActiveSectors(arg0 context.Context, arg1 address.Address, arg2 sealing.TipSetToken) (bitfield.BitField, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "StateMinerActiveSectors", arg0, arg1, arg2) ret0, _ := ret[0].(bitfield.BitField) @@ -231,7 +231,7 @@ func (mr *MockSealingAPIMockRecorder) StateMinerActiveSectors(arg0, arg1, arg2 i } // StateMinerAvailableBalance mocks base method. -func (m *MockSealingAPI) StateMinerAvailableBalance(arg0 context.Context, arg1 address.Address, arg2 sealing2.TipSetToken) (big.Int, error) { +func (m *MockSealingAPI) StateMinerAvailableBalance(arg0 context.Context, arg1 address.Address, arg2 sealing.TipSetToken) (big.Int, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "StateMinerAvailableBalance", arg0, arg1, arg2) ret0, _ := ret[0].(big.Int) @@ -246,7 +246,7 @@ func (mr *MockSealingAPIMockRecorder) StateMinerAvailableBalance(arg0, arg1, arg } // StateMinerInfo mocks base method. -func (m *MockSealingAPI) StateMinerInfo(arg0 context.Context, arg1 address.Address, arg2 sealing2.TipSetToken) (api.MinerInfo, error) { +func (m *MockSealingAPI) StateMinerInfo(arg0 context.Context, arg1 address.Address, arg2 sealing.TipSetToken) (api.MinerInfo, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "StateMinerInfo", arg0, arg1, arg2) ret0, _ := ret[0].(api.MinerInfo) @@ -261,7 +261,7 @@ func (mr *MockSealingAPIMockRecorder) StateMinerInfo(arg0, arg1, arg2 interface{ } // StateMinerInitialPledgeCollateral mocks base method. -func (m *MockSealingAPI) StateMinerInitialPledgeCollateral(arg0 context.Context, arg1 address.Address, arg2 miner.SectorPreCommitInfo, arg3 sealing2.TipSetToken) (big.Int, error) { +func (m *MockSealingAPI) StateMinerInitialPledgeCollateral(arg0 context.Context, arg1 address.Address, arg2 miner.SectorPreCommitInfo, arg3 sealing.TipSetToken) (big.Int, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "StateMinerInitialPledgeCollateral", arg0, arg1, arg2, arg3) ret0, _ := ret[0].(big.Int) @@ -276,7 +276,7 @@ func (mr *MockSealingAPIMockRecorder) StateMinerInitialPledgeCollateral(arg0, ar } // StateMinerPartitions mocks base method. -func (m *MockSealingAPI) StateMinerPartitions(arg0 context.Context, arg1 address.Address, arg2 uint64, arg3 sealing2.TipSetToken) ([]api.Partition, error) { +func (m *MockSealingAPI) StateMinerPartitions(arg0 context.Context, arg1 address.Address, arg2 uint64, arg3 sealing.TipSetToken) ([]api.Partition, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "StateMinerPartitions", arg0, arg1, arg2, arg3) ret0, _ := ret[0].([]api.Partition) @@ -291,7 +291,7 @@ func (mr *MockSealingAPIMockRecorder) StateMinerPartitions(arg0, arg1, arg2, arg } // StateMinerPreCommitDepositForPower mocks base method. -func (m *MockSealingAPI) StateMinerPreCommitDepositForPower(arg0 context.Context, arg1 address.Address, arg2 miner.SectorPreCommitInfo, arg3 sealing2.TipSetToken) (big.Int, error) { +func (m *MockSealingAPI) StateMinerPreCommitDepositForPower(arg0 context.Context, arg1 address.Address, arg2 miner.SectorPreCommitInfo, arg3 sealing.TipSetToken) (big.Int, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "StateMinerPreCommitDepositForPower", arg0, arg1, arg2, arg3) ret0, _ := ret[0].(big.Int) @@ -306,7 +306,7 @@ func (mr *MockSealingAPIMockRecorder) StateMinerPreCommitDepositForPower(arg0, a } // StateMinerProvingDeadline mocks base method. -func (m *MockSealingAPI) StateMinerProvingDeadline(arg0 context.Context, arg1 address.Address, arg2 sealing2.TipSetToken) (*dline.Info, error) { +func (m *MockSealingAPI) StateMinerProvingDeadline(arg0 context.Context, arg1 address.Address, arg2 sealing.TipSetToken) (*dline.Info, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "StateMinerProvingDeadline", arg0, arg1, arg2) ret0, _ := ret[0].(*dline.Info) @@ -321,7 +321,7 @@ func (mr *MockSealingAPIMockRecorder) StateMinerProvingDeadline(arg0, arg1, arg2 } // StateMinerSectorAllocated mocks base method. -func (m *MockSealingAPI) StateMinerSectorAllocated(arg0 context.Context, arg1 address.Address, arg2 abi.SectorNumber, arg3 sealing2.TipSetToken) (bool, error) { +func (m *MockSealingAPI) StateMinerSectorAllocated(arg0 context.Context, arg1 address.Address, arg2 abi.SectorNumber, arg3 sealing.TipSetToken) (bool, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "StateMinerSectorAllocated", arg0, arg1, arg2, arg3) ret0, _ := ret[0].(bool) @@ -336,7 +336,7 @@ func (mr *MockSealingAPIMockRecorder) StateMinerSectorAllocated(arg0, arg1, arg2 } // StateMinerSectorSize mocks base method. -func (m *MockSealingAPI) StateMinerSectorSize(arg0 context.Context, arg1 address.Address, arg2 sealing2.TipSetToken) (abi.SectorSize, error) { +func (m *MockSealingAPI) StateMinerSectorSize(arg0 context.Context, arg1 address.Address, arg2 sealing.TipSetToken) (abi.SectorSize, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "StateMinerSectorSize", arg0, arg1, arg2) ret0, _ := ret[0].(abi.SectorSize) @@ -351,7 +351,7 @@ func (mr *MockSealingAPIMockRecorder) StateMinerSectorSize(arg0, arg1, arg2 inte } // StateMinerWorkerAddress mocks base method. -func (m *MockSealingAPI) StateMinerWorkerAddress(arg0 context.Context, arg1 address.Address, arg2 sealing2.TipSetToken) (address.Address, error) { +func (m *MockSealingAPI) StateMinerWorkerAddress(arg0 context.Context, arg1 address.Address, arg2 sealing.TipSetToken) (address.Address, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "StateMinerWorkerAddress", arg0, arg1, arg2) ret0, _ := ret[0].(address.Address) @@ -366,7 +366,7 @@ func (mr *MockSealingAPIMockRecorder) StateMinerWorkerAddress(arg0, arg1, arg2 i } // StateNetworkVersion mocks base method. -func (m *MockSealingAPI) StateNetworkVersion(arg0 context.Context, arg1 sealing2.TipSetToken) (network.Version, error) { +func (m *MockSealingAPI) StateNetworkVersion(arg0 context.Context, arg1 sealing.TipSetToken) (network.Version, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "StateNetworkVersion", arg0, arg1) ret0, _ := ret[0].(network.Version) @@ -381,10 +381,10 @@ func (mr *MockSealingAPIMockRecorder) StateNetworkVersion(arg0, arg1 interface{} } // StateSearchMsg mocks base method. -func (m *MockSealingAPI) StateSearchMsg(arg0 context.Context, arg1 cid.Cid) (*sealing2.MsgLookup, error) { +func (m *MockSealingAPI) StateSearchMsg(arg0 context.Context, arg1 cid.Cid) (*sealing.MsgLookup, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "StateSearchMsg", arg0, arg1) - ret0, _ := ret[0].(*sealing2.MsgLookup) + ret0, _ := ret[0].(*sealing.MsgLookup) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -396,7 +396,7 @@ func (mr *MockSealingAPIMockRecorder) StateSearchMsg(arg0, arg1 interface{}) *go } // StateSectorGetInfo mocks base method. -func (m *MockSealingAPI) StateSectorGetInfo(arg0 context.Context, arg1 address.Address, arg2 abi.SectorNumber, arg3 sealing2.TipSetToken) (*miner.SectorOnChainInfo, error) { +func (m *MockSealingAPI) StateSectorGetInfo(arg0 context.Context, arg1 address.Address, arg2 abi.SectorNumber, arg3 sealing.TipSetToken) (*miner.SectorOnChainInfo, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "StateSectorGetInfo", arg0, arg1, arg2, arg3) ret0, _ := ret[0].(*miner.SectorOnChainInfo) @@ -411,10 +411,10 @@ func (mr *MockSealingAPIMockRecorder) StateSectorGetInfo(arg0, arg1, arg2, arg3 } // StateSectorPartition mocks base method. -func (m *MockSealingAPI) StateSectorPartition(arg0 context.Context, arg1 address.Address, arg2 abi.SectorNumber, arg3 sealing2.TipSetToken) (*sealing2.SectorLocation, error) { +func (m *MockSealingAPI) StateSectorPartition(arg0 context.Context, arg1 address.Address, arg2 abi.SectorNumber, arg3 sealing.TipSetToken) (*sealing.SectorLocation, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "StateSectorPartition", arg0, arg1, arg2, arg3) - ret0, _ := ret[0].(*sealing2.SectorLocation) + ret0, _ := ret[0].(*sealing.SectorLocation) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -426,7 +426,7 @@ func (mr *MockSealingAPIMockRecorder) StateSectorPartition(arg0, arg1, arg2, arg } // StateSectorPreCommitInfo mocks base method. -func (m *MockSealingAPI) StateSectorPreCommitInfo(arg0 context.Context, arg1 address.Address, arg2 abi.SectorNumber, arg3 sealing2.TipSetToken) (*miner.SectorPreCommitOnChainInfo, error) { +func (m *MockSealingAPI) StateSectorPreCommitInfo(arg0 context.Context, arg1 address.Address, arg2 abi.SectorNumber, arg3 sealing.TipSetToken) (*miner.SectorPreCommitOnChainInfo, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "StateSectorPreCommitInfo", arg0, arg1, arg2, arg3) ret0, _ := ret[0].(*miner.SectorPreCommitOnChainInfo) @@ -441,10 +441,10 @@ func (mr *MockSealingAPIMockRecorder) StateSectorPreCommitInfo(arg0, arg1, arg2, } // StateWaitMsg mocks base method. -func (m *MockSealingAPI) StateWaitMsg(arg0 context.Context, arg1 cid.Cid) (sealing2.MsgLookup, error) { +func (m *MockSealingAPI) StateWaitMsg(arg0 context.Context, arg1 cid.Cid) (sealing.MsgLookup, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "StateWaitMsg", arg0, arg1) - ret0, _ := ret[0].(sealing2.MsgLookup) + ret0, _ := ret[0].(sealing.MsgLookup) ret1, _ := ret[1].(error) return ret0, ret1 } diff --git a/storage/pipeline/mocks/mock_commit_batcher.go b/storage/pipeline/mocks/mock_commit_batcher.go index 51a35c38fdc..a5475c4c7f5 100644 --- a/storage/pipeline/mocks/mock_commit_batcher.go +++ b/storage/pipeline/mocks/mock_commit_batcher.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/filecoin-project/lotus/extern/pipeline (interfaces: CommitBatcherApi) +// Source: github.com/filecoin-project/lotus/storage/pipeline (interfaces: CommitBatcherApi) // Package mocks is a generated GoMock package. package mocks diff --git a/storage/pipeline/mocks/mock_precommit_batcher.go b/storage/pipeline/mocks/mock_precommit_batcher.go index d6a83c6f99b..b6d2964ebab 100644 --- a/storage/pipeline/mocks/mock_precommit_batcher.go +++ b/storage/pipeline/mocks/mock_precommit_batcher.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/filecoin-project/lotus/extern/pipeline (interfaces: PreCommitBatcherApi) +// Source: github.com/filecoin-project/lotus/storage/pipeline (interfaces: PreCommitBatcherApi) // Package mocks is a generated GoMock package. package mocks diff --git a/storage/pipeline/mocks/statemachine.go b/storage/pipeline/mocks/statemachine.go index d5dfc73c710..8ed7cc625a0 100644 --- a/storage/pipeline/mocks/statemachine.go +++ b/storage/pipeline/mocks/statemachine.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/filecoin-project/lotus/extern/pipeline (interfaces: Context) +// Source: github.com/filecoin-project/lotus/storage/pipeline (interfaces: Context) // Package mocks is a generated GoMock package. package mocks diff --git a/storage/sealer/cbor_gen.go b/storage/sealer/cbor_gen.go index b5fc2a98cf9..48bf0146a45 100644 --- a/storage/sealer/cbor_gen.go +++ b/storage/sealer/cbor_gen.go @@ -12,7 +12,7 @@ import ( cbg "github.com/whyrusleeping/cbor-gen" xerrors "golang.org/x/xerrors" - "github.com/filecoin-project/lotus/storage/sealer/sealtasks" + sealtasks "github.com/filecoin-project/lotus/storage/sealer/sealtasks" ) var _ = xerrors.Errorf @@ -48,7 +48,7 @@ func (t *Call) MarshalCBOR(w io.Writer) error { return err } - // t.RetType (sectorstorage.ReturnType) (string) + // t.RetType (sealer.ReturnType) (string) if len("RetType") > cbg.MaxLength { return xerrors.Errorf("Value in field \"RetType\" was too long") } @@ -71,7 +71,7 @@ func (t *Call) MarshalCBOR(w io.Writer) error { return err } - // t.State (sectorstorage.CallState) (uint64) + // t.State (sealer.CallState) (uint64) if len("State") > cbg.MaxLength { return xerrors.Errorf("Value in field \"State\" was too long") } @@ -87,7 +87,7 @@ func (t *Call) MarshalCBOR(w io.Writer) error { return err } - // t.Result (sectorstorage.ManyBytes) (struct) + // t.Result (sealer.ManyBytes) (struct) if len("Result") > cbg.MaxLength { return xerrors.Errorf("Value in field \"Result\" was too long") } @@ -153,7 +153,7 @@ func (t *Call) UnmarshalCBOR(r io.Reader) (err error) { } } - // t.RetType (sectorstorage.ReturnType) (string) + // t.RetType (sealer.ReturnType) (string) case "RetType": { @@ -164,7 +164,7 @@ func (t *Call) UnmarshalCBOR(r io.Reader) (err error) { t.RetType = ReturnType(sval) } - // t.State (sectorstorage.CallState) (uint64) + // t.State (sealer.CallState) (uint64) case "State": { @@ -179,7 +179,7 @@ func (t *Call) UnmarshalCBOR(r io.Reader) (err error) { t.State = CallState(extra) } - // t.Result (sectorstorage.ManyBytes) (struct) + // t.Result (sealer.ManyBytes) (struct) case "Result": { @@ -220,7 +220,7 @@ func (t *WorkState) MarshalCBOR(w io.Writer) error { return err } - // t.ID (sectorstorage.WorkID) (struct) + // t.ID (sealer.WorkID) (struct) if len("ID") > cbg.MaxLength { return xerrors.Errorf("Value in field \"ID\" was too long") } @@ -236,7 +236,7 @@ func (t *WorkState) MarshalCBOR(w io.Writer) error { return err } - // t.Status (sectorstorage.WorkStatus) (string) + // t.Status (sealer.WorkStatus) (string) if len("Status") > cbg.MaxLength { return xerrors.Errorf("Value in field \"Status\" was too long") } @@ -383,7 +383,7 @@ func (t *WorkState) UnmarshalCBOR(r io.Reader) (err error) { } switch name { - // t.ID (sectorstorage.WorkID) (struct) + // t.ID (sealer.WorkID) (struct) case "ID": { @@ -393,7 +393,7 @@ func (t *WorkState) UnmarshalCBOR(r io.Reader) (err error) { } } - // t.Status (sectorstorage.WorkStatus) (string) + // t.Status (sealer.WorkStatus) (string) case "Status": { diff --git a/storage/sealer/stores/mocks/index.go b/storage/sealer/stores/mocks/index.go index 3781421de1c..696d7e9742c 100644 --- a/storage/sealer/stores/mocks/index.go +++ b/storage/sealer/stores/mocks/index.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/filecoin-project/lotus/extern/sealer/stores (interfaces: SectorIndex) +// Source: github.com/filecoin-project/lotus/storage/sealer/stores (interfaces: SectorIndex) // Package mocks is a generated GoMock package. package mocks @@ -12,7 +12,7 @@ import ( abi "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/lotus/storage/sealer/fsutil" + fsutil "github.com/filecoin-project/lotus/storage/sealer/fsutil" storiface "github.com/filecoin-project/lotus/storage/sealer/storiface" ) diff --git a/storage/sealer/stores/mocks/pf.go b/storage/sealer/stores/mocks/pf.go index e88c362603e..360443670b5 100644 --- a/storage/sealer/stores/mocks/pf.go +++ b/storage/sealer/stores/mocks/pf.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/filecoin-project/lotus/extern/sealer/stores (interfaces: PartialFileHandler) +// Source: github.com/filecoin-project/lotus/storage/sealer/stores (interfaces: PartialFileHandler) // Package mocks is a generated GoMock package. package mocks @@ -12,8 +12,8 @@ import ( abi "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/lotus/storage/sealer/partialfile" - "github.com/filecoin-project/lotus/storage/sealer/storiface" + partialfile "github.com/filecoin-project/lotus/storage/sealer/partialfile" + storiface "github.com/filecoin-project/lotus/storage/sealer/storiface" ) // MockPartialFileHandler is a mock of PartialFileHandler interface. diff --git a/storage/sealer/stores/mocks/store.go b/storage/sealer/stores/mocks/store.go index 53b777f0b3c..1906319b56c 100644 --- a/storage/sealer/stores/mocks/store.go +++ b/storage/sealer/stores/mocks/store.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/filecoin-project/lotus/extern/sealer/stores (interfaces: Store) +// Source: github.com/filecoin-project/lotus/storage/sealer/stores (interfaces: Store) // Package mocks is a generated GoMock package. package mocks @@ -13,7 +13,7 @@ import ( abi "github.com/filecoin-project/go-state-types/abi" storage "github.com/filecoin-project/specs-storage/storage" - "github.com/filecoin-project/lotus/storage/sealer/fsutil" + fsutil "github.com/filecoin-project/lotus/storage/sealer/fsutil" storiface "github.com/filecoin-project/lotus/storage/sealer/storiface" )