use the shared API (#4639)

* use the shared API
filecoin-project · Dec 24, 2021 · 3b23ec7 · 3b23ec7
1 parent c6c0a39
commit 3b23ec7
Show file tree

Hide file tree

Showing 107 changed files with 485 additions and 780 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -200,9 +200,9 @@ jobs:
           cmd: "lint"
       - go_build:
           cmd: "build"
-      - go_build:
-          cmd: "gen-api"
-      - check_file_change
+      #- go_build:
+      #    cmd: "gen-api"
+      #- check_file_change
       # place the filecoin binary in PATH for IPTB
       - go_build:
           cmd: "install"

diff --git a/app/client/apiface/chain.go b/app/client/apiface/chain.go
@@ -8,7 +8,6 @@ import (
 	"github.com/filecoin-project/go-bitfield"
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/filecoin-project/go-state-types/dline"
-	"github.com/filecoin-project/venus/pkg/chain"
 	"github.com/filecoin-project/venus/venus-shared/actors/builtin/miner"
 	apitypes "github.com/filecoin-project/venus/venus-shared/api/chain"
 	types "github.com/filecoin-project/venus/venus-shared/chain"
@@ -86,7 +85,7 @@ type IChainInfo interface {
 	// Rule[perm:read]
 	StateVerifierStatus(ctx context.Context, addr address.Address, tsk types.TipSetKey) (*abi.StoragePower, error)
 	// Rule[perm:read]
-	ChainNotify(ctx context.Context) <-chan []*chain.HeadChange
+	ChainNotify(ctx context.Context) <-chan []*apitypes.HeadChange
 	// Rule[perm:read]
 	GetFullBlock(ctx context.Context, id cid.Cid) (*types.FullBlock, error)
 	// Rule[perm:read]
@@ -96,7 +95,7 @@ type IChainInfo interface {
 	// Rule[perm:read]
 	GetEntry(ctx context.Context, height abi.ChainEpoch, round uint64) (*types.BeaconEntry, error)
 	// Rule[perm:read]
-	MessageWait(ctx context.Context, msgCid cid.Cid, confidence, lookback abi.ChainEpoch) (*chain.ChainMessage, error)
+	MessageWait(ctx context.Context, msgCid cid.Cid, confidence, lookback abi.ChainEpoch) (*apitypes.ChainMessage, error)
 	// Rule[perm:read]
 	ProtocolParameters(ctx context.Context) (*apitypes.ProtocolParams, error)
 	// Rule[perm:read]
@@ -148,7 +147,7 @@ type IChainInfo interface {
 	// Rule[perm:read]
 	ChainExport(context.Context, abi.ChainEpoch, bool, types.TipSetKey) (<-chan []byte, error)
 	// Rule[perm:read]
-	ChainGetPath(ctx context.Context, from types.TipSetKey, to types.TipSetKey) ([]*chain.HeadChange, error)
+	ChainGetPath(ctx context.Context, from types.TipSetKey, to types.TipSetKey) ([]*apitypes.HeadChange, error)
 }
 
 type IMinerState interface {
@@ -185,7 +184,7 @@ type IMinerState interface {
 	// Rule[perm:read]
 	StateMinerInitialPledgeCollateral(ctx context.Context, maddr address.Address, pci miner.SectorPreCommitInfo, tsk types.TipSetKey) (big.Int, error)
 	// Rule[perm:read]
-	StateVMCirculatingSupplyInternal(ctx context.Context, tsk types.TipSetKey) (chain.CirculatingSupply, error)
+	StateVMCirculatingSupplyInternal(ctx context.Context, tsk types.TipSetKey) (types.CirculatingSupply, error)
 	// Rule[perm:read]
 	StateCirculatingSupply(ctx context.Context, tsk types.TipSetKey) (abi.TokenAmount, error)
 	// Rule[perm:read]

diff --git a/app/client/apiface/network.go b/app/client/apiface/network.go
@@ -8,8 +8,8 @@ import (
 	"github.com/libp2p/go-libp2p-core/peer"
 	ma "github.com/multiformats/go-multiaddr"
 
-	"github.com/filecoin-project/venus/pkg/net"
 	apitypes "github.com/filecoin-project/venus/venus-shared/api/chain"
+	"github.com/filecoin-project/venus/venus-shared/libp2p/net"
 )
 
 type INetwork interface {

diff --git a/app/client/apiface/paych.go b/app/client/apiface/paych.go
@@ -8,7 +8,7 @@ import (
 	"github.com/filecoin-project/specs-actors/actors/builtin/paych"
 	"github.com/ipfs/go-cid"
 
-	"github.com/filecoin-project/venus/pkg/paychmgr"
+	apitypes "github.com/filecoin-project/venus/venus-shared/api/chain"
 	paychtypes "github.com/filecoin-project/venus/venus-shared/paych"
 )
 
@@ -22,12 +22,12 @@ type IPaychan interface {
 	// PaychAvailableFunds get the status of an outbound payment channel
 	// @pch: payment channel address
 	// Rule[perm:sign]
-	PaychAvailableFunds(ctx context.Context, ch address.Address) (*paychmgr.ChannelAvailableFunds, error)
+	PaychAvailableFunds(ctx context.Context, ch address.Address) (*apitypes.ChannelAvailableFunds, error)
 	// PaychAvailableFundsByFromTo  get the status of an outbound payment channel
 	// @from: the payment channel sender
 	// @to: he payment channel recipient
 	// Rule[perm:sign]
-	PaychAvailableFundsByFromTo(ctx context.Context, from, to address.Address) (*paychmgr.ChannelAvailableFunds, error)
+	PaychAvailableFundsByFromTo(ctx context.Context, from, to address.Address) (*apitypes.ChannelAvailableFunds, error)
 	// PaychGetWaitReady waits until the create channel / add funds message with the sentinel
 	// @sentinel: given message CID arrives.
 	// @ch: the returned channel address can safely be used against the Manager methods.
@@ -87,7 +87,7 @@ type IPaychan interface {
 	// If there are insufficient funds in the channel to create the voucher,
 	// returns a nil voucher and the shortfall.
 	// Rule[perm:sign]
-	PaychVoucherCreate(ctx context.Context, pch address.Address, amt big.Int, lane uint64) (*paychmgr.VoucherCreateResult, error)
+	PaychVoucherCreate(ctx context.Context, pch address.Address, amt big.Int, lane uint64) (*paychtypes.VoucherCreateResult, error)
 	// PaychVoucherList list vouchers in payment channel
 	// @pch: payment channel address
 	// Rule[perm:write]

diff --git a/app/client/apiface/v0api/chain.go b/app/client/apiface/v0api/chain.go
@@ -13,7 +13,6 @@ import (
 	"github.com/filecoin-project/go-state-types/network"
 	"github.com/ipfs/go-cid"
 
-	"github.com/filecoin-project/venus/pkg/chain"
 	"github.com/filecoin-project/venus/venus-shared/actors/builtin/miner"
 	apitypes "github.com/filecoin-project/venus/venus-shared/api/chain"
 	types "github.com/filecoin-project/venus/venus-shared/chain"
@@ -80,7 +79,7 @@ type IChainInfo interface {
 	// Rule[perm:read]
 	StateVerifierStatus(ctx context.Context, addr address.Address, tsk types.TipSetKey) (*abi.StoragePower, error)
 	// Rule[perm:read]
-	ChainNotify(ctx context.Context) <-chan []*chain.HeadChange
+	ChainNotify(ctx context.Context) <-chan []*apitypes.HeadChange
 	// Rule[perm:read]
 	GetFullBlock(ctx context.Context, id cid.Cid) (*types.FullBlock, error)
 	// Rule[perm:read]
@@ -90,7 +89,7 @@ type IChainInfo interface {
 	// Rule[perm:read]
 	GetEntry(ctx context.Context, height abi.ChainEpoch, round uint64) (*types.BeaconEntry, error)
 	// Rule[perm:read]
-	MessageWait(ctx context.Context, msgCid cid.Cid, confidence, lookback abi.ChainEpoch) (*chain.ChainMessage, error)
+	MessageWait(ctx context.Context, msgCid cid.Cid, confidence, lookback abi.ChainEpoch) (*apitypes.ChainMessage, error)
 	// Rule[perm:read]
 	ProtocolParameters(ctx context.Context) (*apitypes.ProtocolParams, error)
 	// Rule[perm:read]
@@ -114,7 +113,7 @@ type IChainInfo interface {
 	// Rule[perm:read]
 	ChainExport(context.Context, abi.ChainEpoch, bool, types.TipSetKey) (<-chan []byte, error)
 	// Rule[perm:read]
-	ChainGetPath(ctx context.Context, from types.TipSetKey, to types.TipSetKey) ([]*chain.HeadChange, error)
+	ChainGetPath(ctx context.Context, from types.TipSetKey, to types.TipSetKey) ([]*apitypes.HeadChange, error)
 }
 
 type IMinerState interface {
@@ -151,7 +150,7 @@ type IMinerState interface {
 	// Rule[perm:read]
 	StateMinerInitialPledgeCollateral(ctx context.Context, maddr address.Address, pci miner.SectorPreCommitInfo, tsk types.TipSetKey) (big.Int, error)
 	// Rule[perm:read]
-	StateVMCirculatingSupplyInternal(ctx context.Context, tsk types.TipSetKey) (chain.CirculatingSupply, error)
+	StateVMCirculatingSupplyInternal(ctx context.Context, tsk types.TipSetKey) (types.CirculatingSupply, error)
 	// Rule[perm:read]
 	StateCirculatingSupply(ctx context.Context, tsk types.TipSetKey) (abi.TokenAmount, error)
 	// Rule[perm:read]

diff --git a/app/client/apiface/v0api/network.go b/app/client/apiface/v0api/network.go
@@ -4,8 +4,7 @@ import (
 	"context"
 
 	apitypes "github.com/filecoin-project/venus/venus-shared/api/chain"
-
-	"github.com/filecoin-project/venus/pkg/net"
+	"github.com/filecoin-project/venus/venus-shared/libp2p/net"
 	"github.com/ipfs/go-cid"
 	"github.com/libp2p/go-libp2p-core/metrics"
 	"github.com/libp2p/go-libp2p-core/peer"

diff --git a/app/client/apiface/v0api/paych.go b/app/client/apiface/v0api/paych.go
@@ -8,7 +8,7 @@ import (
 	"github.com/filecoin-project/specs-actors/actors/builtin/paych"
 	"github.com/ipfs/go-cid"
 
-	"github.com/filecoin-project/venus/pkg/paychmgr"
+	apitypes "github.com/filecoin-project/venus/venus-shared/api/chain"
 	paychtypes "github.com/filecoin-project/venus/venus-shared/paych"
 )
 
@@ -22,12 +22,12 @@ type IPaychan interface {
 	// PaychAvailableFunds get the status of an outbound payment channel
 	// @pch: payment channel address
 	// Rule[perm:sign]
-	PaychAvailableFunds(ctx context.Context, ch address.Address) (*paychmgr.ChannelAvailableFunds, error)
+	PaychAvailableFunds(ctx context.Context, ch address.Address) (*apitypes.ChannelAvailableFunds, error)
 	// PaychAvailableFundsByFromTo  get the status of an outbound payment channel
 	// @from: the payment channel sender
 	// @to: he payment channel recipient
 	// Rule[perm:sign]
-	PaychAvailableFundsByFromTo(ctx context.Context, from, to address.Address) (*paychmgr.ChannelAvailableFunds, error)
+	PaychAvailableFundsByFromTo(ctx context.Context, from, to address.Address) (*apitypes.ChannelAvailableFunds, error)
 	// PaychGetWaitReady waits until the create channel / add funds message with the sentinel
 	// @sentinel: given message CID arrives.
 	// @ch: the returned channel address can safely be used against the Manager methods.
@@ -87,7 +87,7 @@ type IPaychan interface {
 	// If there are insufficient funds in the channel to create the voucher,
 	// returns a nil voucher and the shortfall.
 	// Rule[perm:sign]
-	PaychVoucherCreate(ctx context.Context, pch address.Address, amt big.Int, lane uint64) (*paychmgr.VoucherCreateResult, error)
+	PaychVoucherCreate(ctx context.Context, pch address.Address, amt big.Int, lane uint64) (*paychtypes.VoucherCreateResult, error)
 	// PaychVoucherList list vouchers in payment channel
 	// @pch: payment channel address
 	// Rule[perm:write]