cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

fix(lint): fix lint errors

Browse Source
This commit is contained in:
hannahhoward 2020-06-30 12:59:53 -07:00 committed by Łukasz Magiera
parent be29f3bd99
commit 92bb5bd915
2 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chain/events/state/predicates_test.go
View File

@ -130,7 +130,7 @@ func TestPredicates(t *testing.T) {
// Diff with non-existent deal. // Diff with non-existent deal.
noDeal := []abi.DealID{3} noDeal := []abi.DealID{3}
diffNoDealFn := preds.OnStorageMarketActorChanged(preds.OnDealStateChanged(preds.DealStateChangedForIDs(noDeal))) diffNoDealFn := preds.OnStorageMarketActorChanged(preds.OnDealStateChanged(preds.DealStateChangedForIDs(noDeal)))
changed, val, err = diffNoDealFn(ctx, oldState, newState) changed, _, err = diffNoDealFn(ctx, oldState, newState)
require.NoError(t, err) require.NoError(t, err)
require.False(t, changed) require.False(t, changed)

62
markets/storageadapter/client.go
View File

@ -64,13 +64,13 @@ func NewClientNodeAdapter(state full.StateAPI, chain full.ChainAPI, mpool full.M
} }
} }
func (n *ClientNodeAdapter) ListStorageProviders(ctx context.Context, encodedTs shared.TipSetToken) ([]*storagemarket.StorageProviderInfo, error) { func (c *ClientNodeAdapter) ListStorageProviders(ctx context.Context, encodedTs shared.TipSetToken) ([]*storagemarket.StorageProviderInfo, error) {
tsk, err := types.TipSetKeyFromBytes(encodedTs) tsk, err := types.TipSetKeyFromBytes(encodedTs)
if err != nil { if err != nil {
return nil, err return nil, err
} }
addresses, err := n.StateListMiners(ctx, tsk) addresses, err := c.StateListMiners(ctx, tsk)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -78,7 +78,7 @@ func (n *ClientNodeAdapter) ListStorageProviders(ctx context.Context, encodedTs
var out []*storagemarket.StorageProviderInfo var out []*storagemarket.StorageProviderInfo
for _, addr := range addresses { for _, addr := range addresses {
mi, err := n.StateMinerInfo(ctx, addr, tsk) mi, err := c.StateMinerInfo(ctx, addr, tsk)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -98,8 +98,8 @@ func (n *ClientNodeAdapter) ListStorageProviders(ctx context.Context, encodedTs
return out, nil return out, nil
} }
func (n *ClientNodeAdapter) VerifySignature(ctx context.Context, sig crypto.Signature, addr address.Address, input []byte, encodedTs shared.TipSetToken) (bool, error) { func (c *ClientNodeAdapter) VerifySignature(ctx context.Context, sig crypto.Signature, addr address.Address, input []byte, encodedTs shared.TipSetToken) (bool, error) {
addr, err := n.StateAccountKey(ctx, addr, types.EmptyTSK) addr, err := c.StateAccountKey(ctx, addr, types.EmptyTSK)
if err != nil { if err != nil {
return false, err return false, err
} }
@ -108,13 +108,13 @@ func (n *ClientNodeAdapter) VerifySignature(ctx context.Context, sig crypto.Sign
return err == nil, err return err == nil, err
} }
func (n *ClientNodeAdapter) ListClientDeals(ctx context.Context, addr address.Address, encodedTs shared.TipSetToken) ([]storagemarket.StorageDeal, error) { func (c *ClientNodeAdapter) ListClientDeals(ctx context.Context, addr address.Address, encodedTs shared.TipSetToken) ([]storagemarket.StorageDeal, error) {
tsk, err := types.TipSetKeyFromBytes(encodedTs) tsk, err := types.TipSetKeyFromBytes(encodedTs)
if err != nil { if err != nil {
return nil, err return nil, err
} }
allDeals, err := n.StateMarketDeals(ctx, tsk) allDeals, err := c.StateMarketDeals(ctx, tsk)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -132,9 +132,9 @@ func (n *ClientNodeAdapter) ListClientDeals(ctx context.Context, addr address.Ad
} }
// Adds funds with the StorageMinerActor for a storage participant. Used by both providers and clients. // Adds funds with the StorageMinerActor for a storage participant. Used by both providers and clients.
func (n *ClientNodeAdapter) AddFunds(ctx context.Context, addr address.Address, amount abi.TokenAmount) (cid.Cid, error) { func (c *ClientNodeAdapter) AddFunds(ctx context.Context, addr address.Address, amount abi.TokenAmount) (cid.Cid, error) {
// (Provider Node API) // (Provider Node API)
smsg, err := n.MpoolPushMessage(ctx, &types.Message{ smsg, err := c.MpoolPushMessage(ctx, &types.Message{
To: builtin.StorageMarketActorAddr, To: builtin.StorageMarketActorAddr,
From: addr, From: addr,
Value: amount, Value: amount,
@ -149,17 +149,17 @@ func (n *ClientNodeAdapter) AddFunds(ctx context.Context, addr address.Address,
return smsg.Cid(), nil return smsg.Cid(), nil
} }
func (n *ClientNodeAdapter) EnsureFunds(ctx context.Context, addr, wallet address.Address, amount abi.TokenAmount, ts shared.TipSetToken) (cid.Cid, error) { func (c *ClientNodeAdapter) EnsureFunds(ctx context.Context, addr, wallet address.Address, amount abi.TokenAmount, ts shared.TipSetToken) (cid.Cid, error) {
return n.fm.EnsureAvailable(ctx, addr, wallet, amount) return c.fm.EnsureAvailable(ctx, addr, wallet, amount)
} }
func (n *ClientNodeAdapter) GetBalance(ctx context.Context, addr address.Address, encodedTs shared.TipSetToken) (storagemarket.Balance, error) { func (c *ClientNodeAdapter) GetBalance(ctx context.Context, addr address.Address, encodedTs shared.TipSetToken) (storagemarket.Balance, error) {
tsk, err := types.TipSetKeyFromBytes(encodedTs) tsk, err := types.TipSetKeyFromBytes(encodedTs)
if err != nil { if err != nil {
return storagemarket.Balance{}, err return storagemarket.Balance{}, err
} }
bal, err := n.StateMarketBalance(ctx, addr, tsk) bal, err := c.StateMarketBalance(ctx, addr, tsk)
if err != nil { if err != nil {
return storagemarket.Balance{}, err return storagemarket.Balance{}, err
} }
@ -424,19 +424,19 @@ func (c *ClientNodeAdapter) OnDealExpiredOrSlashed(ctx context.Context, dealID a
return nil return nil
} }
func (n *ClientNodeAdapter) SignProposal(ctx context.Context, signer address.Address, proposal samarket.DealProposal) (*samarket.ClientDealProposal, error) { func (c *ClientNodeAdapter) SignProposal(ctx context.Context, signer address.Address, proposal samarket.DealProposal) (*samarket.ClientDealProposal, error) {
// TODO: output spec signed proposal // TODO: output spec signed proposal
buf, err := cborutil.Dump(&proposal) buf, err := cborutil.Dump(&proposal)
if err != nil { if err != nil {
return nil, err return nil, err
} }
signer, err = n.StateAccountKey(ctx, signer, types.EmptyTSK) signer, err = c.StateAccountKey(ctx, signer, types.EmptyTSK)
if err != nil { if err != nil {
return nil, err return nil, err
} }
sig, err := n.Wallet.Sign(ctx, signer, buf) sig, err := c.Wallet.Sign(ctx, signer, buf)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -447,18 +447,18 @@ func (n *ClientNodeAdapter) SignProposal(ctx context.Context, signer address.Add
}, nil }, nil
} }
func (n *ClientNodeAdapter) GetDefaultWalletAddress(ctx context.Context) (address.Address, error) { func (c *ClientNodeAdapter) GetDefaultWalletAddress(ctx context.Context) (address.Address, error) {
addr, err := n.Wallet.GetDefault() addr, err := c.Wallet.GetDefault()
return addr, err return addr, err
} }
func (n *ClientNodeAdapter) ValidateAskSignature(ctx context.Context, ask *storagemarket.SignedStorageAsk, encodedTs shared.TipSetToken) (bool, error) { func (c *ClientNodeAdapter) ValidateAskSignature(ctx context.Context, ask *storagemarket.SignedStorageAsk, encodedTs shared.TipSetToken) (bool, error) {
tsk, err := types.TipSetKeyFromBytes(encodedTs) tsk, err := types.TipSetKeyFromBytes(encodedTs)
if err != nil { if err != nil {
return false, err return false, err
} }
mi, err := n.StateMinerInfo(ctx, ask.Ask.Miner, tsk) mi, err := c.StateMinerInfo(ctx, ask.Ask.Miner, tsk)
if err != nil { if err != nil {
return false, xerrors.Errorf("failed to get worker for miner in ask", err) return false, xerrors.Errorf("failed to get worker for miner in ask", err)
} }
@ -468,12 +468,12 @@ func (n *ClientNodeAdapter) ValidateAskSignature(ctx context.Context, ask *stora
return false, xerrors.Errorf("failed to re-serialize ask") return false, xerrors.Errorf("failed to re-serialize ask")
} }
ts, err := n.ChainGetTipSet(ctx, tsk) ts, err := c.ChainGetTipSet(ctx, tsk)
if err != nil { if err != nil {
return false, xerrors.Errorf("failed to load tipset") return false, xerrors.Errorf("failed to load tipset")
} }
m, err := n.StateManager.ResolveToKeyAddress(ctx, mi.Worker, ts) m, err := c.StateManager.ResolveToKeyAddress(ctx, mi.Worker, ts)
if err != nil { if err != nil {
return false, xerrors.Errorf("failed to resolve miner to key address") return false, xerrors.Errorf("failed to resolve miner to key address")
@ -483,8 +483,8 @@ func (n *ClientNodeAdapter) ValidateAskSignature(ctx context.Context, ask *stora
return err == nil, err return err == nil, err
} }
func (n *ClientNodeAdapter) GetChainHead(ctx context.Context) (shared.TipSetToken, abi.ChainEpoch, error) { func (c *ClientNodeAdapter) GetChainHead(ctx context.Context) (shared.TipSetToken, abi.ChainEpoch, error) {
head, err := n.ChainHead(ctx) head, err := c.ChainHead(ctx)
if err != nil { if err != nil {
return nil, 0, err return nil, 0, err
} }
@ -492,20 +492,20 @@ func (n *ClientNodeAdapter) GetChainHead(ctx context.Context) (shared.TipSetToke
return head.Key().Bytes(), head.Height(), nil return head.Key().Bytes(), head.Height(), nil
} }
func (n *ClientNodeAdapter) WaitForMessage(ctx context.Context, mcid cid.Cid, cb func(code exitcode.ExitCode, bytes []byte, err error) error) error { func (c *ClientNodeAdapter) WaitForMessage(ctx context.Context, mcid cid.Cid, cb func(code exitcode.ExitCode, bytes []byte, err error) error) error {
receipt, err := n.StateWaitMsg(ctx, mcid, build.MessageConfidence) receipt, err := c.StateWaitMsg(ctx, mcid, build.MessageConfidence)
if err != nil { if err != nil {
return cb(0, nil, err) return cb(0, nil, err)
} }
return cb(receipt.Receipt.ExitCode, receipt.Receipt.Return, nil) return cb(receipt.Receipt.ExitCode, receipt.Receipt.Return, nil)
} }
func (n *ClientNodeAdapter) GetMinerInfo(ctx context.Context, addr address.Address, encodedTs shared.TipSetToken) (*storagemarket.StorageProviderInfo, error) { func (c *ClientNodeAdapter) GetMinerInfo(ctx context.Context, addr address.Address, encodedTs shared.TipSetToken) (*storagemarket.StorageProviderInfo, error) {
tsk, err := types.TipSetKeyFromBytes(encodedTs) tsk, err := types.TipSetKeyFromBytes(encodedTs)
if err != nil { if err != nil {
return nil, err return nil, err
} }
mi, err := n.StateMinerInfo(ctx, addr, tsk) mi, err := c.StateMinerInfo(ctx, addr, tsk)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -521,13 +521,13 @@ func (n *ClientNodeAdapter) GetMinerInfo(ctx context.Context, addr address.Addre
return &out, nil return &out, nil
} }
func (n *ClientNodeAdapter) SignBytes(ctx context.Context, signer address.Address, b []byte) (*crypto.Signature, error) { func (c *ClientNodeAdapter) SignBytes(ctx context.Context, signer address.Address, b []byte) (*crypto.Signature, error) {
signer, err := n.StateAccountKey(ctx, signer, types.EmptyTSK) signer, err := c.StateAccountKey(ctx, signer, types.EmptyTSK)
if err != nil { if err != nil {
return nil, err return nil, err
} }
localSignature, err := n.Wallet.Sign(ctx, signer, b) localSignature, err := c.Wallet.Sign(ctx, signer, b)
if err != nil { if err != nil {
return nil, err return nil, err
} }