go/consensus/api: delay Block.Meta decoding

oasisprotocol · Dec 23, 2019 · fbed77b · fbed77b
1 parent 329e023
commit fbed77b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/go/consensus/api/api.go b/go/consensus/api/api.go
@@ -6,6 +6,7 @@ import (
 	"context"
 
 	beacon "github.com/oasislabs/oasis-core/go/beacon/api"
+	"github.com/oasislabs/oasis-core/go/common/cbor"
 	"github.com/oasislabs/oasis-core/go/common/crypto/signature"
 	"github.com/oasislabs/oasis-core/go/common/errors"
 	"github.com/oasislabs/oasis-core/go/common/node"
@@ -73,7 +74,7 @@ type Block struct {
 	// Height contains the block height.
 	Height int64 `json:"height"`
 	// Meta contains the consensus backend specific block metadata.
-	Meta interface{} `json:"meta"`
+	Meta cbor.RawMessage `json:"meta"`
 }
 
 // Backend is an interface that a consensus backend must provide.

diff --git a/go/consensus/tendermint/api/api.go b/go/consensus/tendermint/api/api.go
@@ -12,6 +12,7 @@ import (
 	tmp2p "github.com/tendermint/tendermint/p2p"
 	tmtypes "github.com/tendermint/tendermint/types"
 
+	"github.com/oasislabs/oasis-core/go/common/cbor"
 	"github.com/oasislabs/oasis-core/go/common/crypto/signature"
 	"github.com/oasislabs/oasis-core/go/common/node"
 	consensus "github.com/oasislabs/oasis-core/go/consensus/api"
@@ -140,11 +141,14 @@ type BlockMeta struct {
 
 // NewBlock creates a new consensus.Block from a Tendermint block.
 func NewBlock(blk *tmtypes.Block) *consensus.Block {
+	meta := BlockMeta{
+		Header:     &blk.Header,
+		LastCommit: blk.LastCommit,
+	}
+	rawMeta := cbor.Marshal(meta)
+
 	return &consensus.Block{
 		Height: blk.Header.Height,
-		Meta: BlockMeta{
-			Header:     &blk.Header,
-			LastCommit: blk.LastCommit,
-		},
+		Meta:   rawMeta,
 	}
 }