From 5129c1ffcd69af83ae0c77541b4dc3f07ed0e03d Mon Sep 17 00:00:00 2001 From: Mike <41407352+hunjixin@users.noreply.github.com> Date: Tue, 7 Dec 2021 13:27:26 +0800 Subject: [PATCH] Feat/support oss storage (#149) * use oss storage * fix reference --- storage-sealing/deals.go | 1 - storage-sealing/sealing.go | 2 ++ storage/adapter_storage_miner.go | 8 +++----- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/storage-sealing/deals.go b/storage-sealing/deals.go index 06bf3806..190b47ce 100644 --- a/storage-sealing/deals.go +++ b/storage-sealing/deals.go @@ -4,7 +4,6 @@ import ( "context" types2 "github.com/filecoin-project/venus-market/types" - "github.com/filecoin-project/venus-sealer/types" ) diff --git a/storage-sealing/sealing.go b/storage-sealing/sealing.go index 41f8cc0b..de133936 100644 --- a/storage-sealing/sealing.go +++ b/storage-sealing/sealing.go @@ -3,6 +3,7 @@ package sealing import ( "context" "errors" + types3 "github.com/filecoin-project/venus-market/types" "sync" "time" @@ -34,6 +35,7 @@ import ( "github.com/filecoin-project/venus-market/piecestorage" types3 "github.com/filecoin-project/venus-market/types" + "github.com/filecoin-project/venus-market/piecestorage" ) var log = logging.Logger("sectors") diff --git a/storage/adapter_storage_miner.go b/storage/adapter_storage_miner.go index 08b314d0..c7655f8f 100644 --- a/storage/adapter_storage_miner.go +++ b/storage/adapter_storage_miner.go @@ -3,6 +3,7 @@ package storage import ( "bytes" "context" + "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" "golang.org/x/xerrors" @@ -25,9 +26,6 @@ import ( "github.com/filecoin-project/venus/pkg/types/specactors/builtin/market" "github.com/filecoin-project/venus/pkg/types/specactors/builtin/miner" - api4 "github.com/filecoin-project/venus-market/api" - types4 "github.com/filecoin-project/venus-market/types" - "github.com/filecoin-project/venus-sealer/api" "github.com/filecoin-project/venus-sealer/constants" sealing "github.com/filecoin-project/venus-sealer/storage-sealing" @@ -41,10 +39,10 @@ var _ sealing.SealingAPI = new(SealingAPIAdapter) type SealingAPIAdapter struct { delegate fullNodeFilteredAPI messager api.IMessager - marketAPI api4.MarketFullNode + marketAPI api2.MarketFullNode } -func NewSealingAPIAdapter(api fullNodeFilteredAPI, messager api.IMessager, marketAPI api4.MarketFullNode) SealingAPIAdapter { +func NewSealingAPIAdapter(api fullNodeFilteredAPI, messager api.IMessager, marketAPI api2.MarketFullNode) SealingAPIAdapter { return SealingAPIAdapter{delegate: api, messager: messager, marketAPI: marketAPI} }