Drop 'rewards list' for now

api/api_full.go

@@ -15,7 +15,6 @@ import (
 	"github.com/filecoin-project/specs-actors/actors/builtin/market"
 	"github.com/filecoin-project/specs-actors/actors/builtin/miner"
 	"github.com/filecoin-project/specs-actors/actors/builtin/paych"
-	"github.com/filecoin-project/specs-actors/actors/builtin/reward"
 	"github.com/filecoin-project/specs-actors/actors/crypto"
 
 	"github.com/filecoin-project/lotus/chain/store"
@@ -140,7 +139,6 @@ type FullNode interface {
 	StateChangedActors(context.Context, cid.Cid, cid.Cid) (map[string]types.Actor, error)
 	StateGetReceipt(context.Context, cid.Cid, types.TipSetKey) (*types.MessageReceipt, error)
 	StateMinerSectorCount(context.Context, address.Address, types.TipSetKey) (MinerSectors, error)
-	StateListRewards(context.Context, address.Address, types.TipSetKey) ([]reward.Reward, error)
 	StateCompute(context.Context, abi.ChainEpoch, []*types.Message, types.TipSetKey) (*ComputeStateOutput, error)
 
 	MsigGetAvailableBalance(context.Context, address.Address, types.TipSetKey) (types.BigInt, error)

api/apistruct/struct.go

@@ -16,7 +16,6 @@ import (
 	"github.com/filecoin-project/specs-actors/actors/abi/big"
 	"github.com/filecoin-project/specs-actors/actors/builtin/miner"
 	"github.com/filecoin-project/specs-actors/actors/builtin/paych"
-	"github.com/filecoin-project/specs-actors/actors/builtin/reward"
 	"github.com/filecoin-project/specs-actors/actors/crypto"
 	"github.com/filecoin-project/specs-storage/storage"
 
@@ -141,7 +140,6 @@ type FullNodeStruct struct {
 		StateGetReceipt          func(context.Context, cid.Cid, types.TipSetKey) (*types.MessageReceipt, error)                                      `perm:"read"`
 		StateMinerSectorCount    func(context.Context, address.Address, types.TipSetKey) (api.MinerSectors, error)                                   `perm:"read"`
 		StateListMessages        func(ctx context.Context, match *types.Message, tsk types.TipSetKey, toht abi.ChainEpoch) ([]cid.Cid, error)        `perm:"read"`
-		StateListRewards         func(context.Context, address.Address, types.TipSetKey) ([]reward.Reward, error)                                    `perm:"read"`
 		StateCompute             func(context.Context, abi.ChainEpoch, []*types.Message, types.TipSetKey) (*api.ComputeStateOutput, error)           `perm:"read"`
 
 		MsigGetAvailableBalance func(context.Context, address.Address, types.TipSetKey) (types.BigInt, error) `perm:"read"`
@@ -586,10 +584,6 @@ func (c *FullNodeStruct) StateListMessages(ctx context.Context, match *types.Mes
 	return c.Internal.StateListMessages(ctx, match, tsk, toht)
 }
 
-func (c *FullNodeStruct) StateListRewards(ctx context.Context, miner address.Address, tsk types.TipSetKey) ([]reward.Reward, error) {
-	return c.Internal.StateListRewards(ctx, miner, tsk)
-}
-
 func (c *FullNodeStruct) StateCompute(ctx context.Context, height abi.ChainEpoch, msgs []*types.Message, tsk types.TipSetKey) (*api.ComputeStateOutput, error) {
 	return c.Internal.StateCompute(ctx, height, msgs, tsk)
 }

cmd/lotus-storage-miner/rewards.go

@@ -15,47 +15,10 @@ import (
 var rewardsCmd = &cli.Command{
 	Name: "rewards",
 	Subcommands: []*cli.Command{
-		rewardsListCmd,
 		rewardsRedeemCmd,
 	},
 }
 
-var rewardsListCmd = &cli.Command{
-	Name:  "list",
-	Usage: "Print unclaimed block rewards earned",
-	Action: func(cctx *cli.Context) error {
-		nodeApi, closer, err := lcli.GetStorageMinerAPI(cctx)
-		if err != nil {
-			return err
-		}
-		defer closer()
-
-		api, acloser, err := lcli.GetFullNodeAPI(cctx)
-		if err != nil {
-			return err
-		}
-		defer acloser()
-
-		ctx := lcli.ReqContext(cctx)
-
-		maddr, err := nodeApi.ActorAddress(ctx)
-		if err != nil {
-			return err
-		}
-
-		rewards, err := api.StateListRewards(ctx, maddr, types.EmptyTSK)
-		if err != nil {
-			return err
-		}
-
-		for _, r := range rewards {
-			fmt.Printf("%d\t%d\t%s\n", r.StartEpoch, r.EndEpoch, types.FIL(r.Value))
-		}
-
-		return nil
-	},
-}
-
 var rewardsRedeemCmd = &cli.Command{
 	Name:  "redeem",
 	Usage: "Redeem block rewards",
@@ -94,6 +57,8 @@ var rewardsRedeemCmd = &cli.Command{
 			return err
 		}
 
+		panic("todo correct method; call miner actor")
+
 		smsg, err := api.WalletSignMessage(ctx, worker, &types.Message{
 			To:       builtin.RewardActorAddr,
 			From:     worker,
@@ -101,7 +66,7 @@ var rewardsRedeemCmd = &cli.Command{
 			Value:    types.NewInt(0),
 			GasPrice: types.NewInt(1),
 			GasLimit: 100000,
-			Method:   builtin.MethodsReward.WithdrawReward,
+			Method:   0,
 			Params:   params,
 		})
 		if err != nil {