fix up the tests and cli

2019-08-01 20:51:34 -07:00
parent dc7c0fcabe
commit e5f4c75ca4
4 changed files with 23 additions and 8 deletions
@@ -77,13 +77,21 @@ func (a *FullNodeAPI) ChainGetBlock(ctx context.Context, msg cid.Cid) (*types.Bl
 	return a.Chain.GetBlock(msg)
 }

-func (a *FullNodeAPI) ChainGetBlockMessages(ctx context.Context, msg cid.Cid) ([]*types.Message, []*types.SignedMessage, error) {
+func (a *FullNodeAPI) ChainGetBlockMessages(ctx context.Context, msg cid.Cid) (*api.BlockMessages, error) {
 	b, err := a.Chain.GetBlock(msg)
 	if err != nil {
-		return nil, nil, err
+		return nil, err
 	}

-	return a.Chain.MessagesForBlock(b)
+	bmsgs, smsgs, err := a.Chain.MessagesForBlock(b)
+	if err != nil {
+		return nil, err
+	}
+
+	return &api.BlockMessages{
+		BlsMessages:   bmsgs,
+		SecpkMessages: smsgs,
+	}, nil
 }

 func (a *FullNodeAPI) ChainCall(ctx context.Context, msg *types.Message, ts *types.TipSet) (*types.MessageReceipt, error) {