[FAB-1190] Make Rawledger accept metadata

SBFT needs to persist its own batch headers and signatures on its ledger (Rawledger, implementations: Fileledger, Ramledger). Rawledger interface needs to be modified to accept custom metadata where those objects can be stored. Change-Id: I0127b2a31a327c8ac39082b07627871951f82a0e Signed-off-by: Gabor Hosszu <gabor@digitalasset.com>
hyperledger · Nov 23, 2016 · f6d1be2 · f6d1be2
1 parent 68aef4e
commit f6d1be2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/orderer/rawledger/fileledger/fileledger.go b/orderer/rawledger/fileledger/fileledger.go
@@ -149,7 +149,7 @@ func (fl *fileLedger) Height() uint64 {
 }
 
 // Append creates a new block and appends it to the ledger
-func (fl *fileLedger) Append(messages []*cb.Envelope, proof []byte) *cb.Block {
+func (fl *fileLedger) Append(messages []*cb.Envelope, metadata [][]byte) *cb.Block {
 	data := &cb.BlockData{
 		Data: make([][]byte, len(messages)),
 	}
@@ -170,7 +170,7 @@ func (fl *fileLedger) Append(messages []*cb.Envelope, proof []byte) *cb.Block {
 		},
 		Data: data,
 		Metadata: &cb.BlockMetadata{
-			Metadata: [][]byte{proof},
+			Metadata: metadata,
 		},
 	}
 	fl.writeBlock(block)

diff --git a/orderer/rawledger/ramledger/ramledger.go b/orderer/rawledger/ramledger/ramledger.go
@@ -133,7 +133,7 @@ func (cu *cursor) ReadyChan() <-chan struct{} {
 }
 
 // Append creates a new block and appends it to the ledger
-func (rl *ramLedger) Append(messages []*cb.Envelope, proof []byte) *cb.Block {
+func (rl *ramLedger) Append(messages []*cb.Envelope, metadata [][]byte) *cb.Block {
 	data := &cb.BlockData{
 		Data: make([][]byte, len(messages)),
 	}
@@ -154,7 +154,7 @@ func (rl *ramLedger) Append(messages []*cb.Envelope, proof []byte) *cb.Block {
 		},
 		Data: data,
 		Metadata: &cb.BlockMetadata{
-			Metadata: [][]byte{proof},
+			Metadata: metadata,
 		},
 	}
 	rl.appendBlock(block)

diff --git a/orderer/rawledger/rawledger.go b/orderer/rawledger/rawledger.go
@@ -40,7 +40,7 @@ type Reader interface {
 // Writer allows the caller to modify the raw ledger
 type Writer interface {
 	// Append a new block to the ledger
-	Append(blockContents []*cb.Envelope, proof []byte) *cb.Block
+	Append(blockContents []*cb.Envelope, metadata [][]byte) *cb.Block
 }
 
 // ReadWriter encapsulated both the reading and writing functions of the rawledger

diff --git a/orderer/sbft/backend/backend.go b/orderer/sbft/backend/backend.go
@@ -302,7 +302,7 @@ func (t *Backend) Deliver(batch *s.Batch) {
 			logger.Warningf("Payload cannot be unmarshalled.")
 		}
 	}
-	t.ledger.Append(blockContents, []byte{})
+	t.ledger.Append(blockContents, nil)
 }
 
 func (t *Backend) Persist(key string, data proto.Message) {