Merge branch 'master' into nonsense/cli-show-deals-backup

node/impl/full/state.go

@@ -76,7 +76,7 @@ type StateAPI struct {
 
 	// TODO: the wallet here is only needed because we have the MinerCreateBlock
 	// API attached to the state API. It probably should live somewhere better
-	Wallet    api.WalletAPI
+	Wallet    api.Wallet
 	DefWallet wallet.Default
 
 	StateModuleAPI

node/impl/full/wallet.go

@@ -22,7 +22,7 @@ type WalletAPI struct {
 
 	StateManagerAPI stmgr.StateManagerAPI
 	Default         wallet.Default
-	api.WalletAPI
+	api.Wallet
 }
 
 func (a *WalletAPI) WalletBalance(ctx context.Context, addr address.Address) (types.BigInt, error) {
@@ -40,7 +40,7 @@ func (a *WalletAPI) WalletSign(ctx context.Context, k address.Address, msg []byt
 	if err != nil {
 		return nil, xerrors.Errorf("failed to resolve ID address: %w", keyAddr)
 	}
-	return a.WalletAPI.WalletSign(ctx, keyAddr, msg, api.MsgMeta{
+	return a.Wallet.WalletSign(ctx, keyAddr, msg, api.MsgMeta{
 		Type: api.MTUnknown,
 	})
 }
@@ -56,7 +56,7 @@ func (a *WalletAPI) WalletSignMessage(ctx context.Context, k address.Address, ms
 		return nil, xerrors.Errorf("serializing message: %w", err)
 	}
 
-	sig, err := a.WalletAPI.WalletSign(ctx, keyAddr, mb.Cid().Bytes(), api.MsgMeta{
+	sig, err := a.Wallet.WalletSign(ctx, keyAddr, mb.Cid().Bytes(), api.MsgMeta{
 		Type:  api.MTChainMsg,
 		Extra: mb.RawData(),
 	})

node/impl/remoteworker.go

@@ -16,7 +16,7 @@ import (
 )
 
 type remoteWorker struct {
-	api.WorkerAPI
+	api.Worker
 	closer jsonrpc.ClientCloser
 }