[FAB-7048] Move deliver from orderer to fabric/common

This CR moves deliver from the orderer to fabric/common. This is being
done to support the future implementation of deliver on the peer.

Change-Id: If077f2c05b5a10fdeb4e6ac315111495304e4c5e
Signed-off-by: Will Lahti <wtlahti@us.ibm.com>

orderer/common/deliver/deliver.go → common/deliver/deliver.go

@@ -19,19 +19,19 @@ package deliver
 import (
 	"io"
 
-	"github.com/golang/protobuf/proto"
 	"github.com/hyperledger/fabric/common/flogging"
+	"github.com/hyperledger/fabric/common/ledger/blockledger"
 	"github.com/hyperledger/fabric/common/policies"
 	"github.com/hyperledger/fabric/common/util"
-	"github.com/hyperledger/fabric/orderer/common/ledger"
-	"github.com/hyperledger/fabric/orderer/common/msgprocessor"
 	cb "github.com/hyperledger/fabric/protos/common"
 	ab "github.com/hyperledger/fabric/protos/orderer"
 	"github.com/hyperledger/fabric/protos/utils"
+
+	"github.com/golang/protobuf/proto"
 	"github.com/op/go-logging"
 )
 
-const pkgLogID = "orderer/common/deliver"
+const pkgLogID = "common/deliver"
 
 var logger *logging.Logger
 
@@ -58,7 +58,7 @@ type Support interface {
 	PolicyManager() policies.Manager
 
 	// Reader returns the chain Reader for the chain
-	Reader() ledger.Reader
+	Reader() blockledger.Reader
 
 	// Errored returns a channel which closes when the backing consenter has errored
 	Errored() <-chan struct{}
@@ -137,7 +137,7 @@ func (ds *deliverServer) deliverBlocks(srv ab.AtomicBroadcast_DeliverServer, env
 
 	lastConfigSequence := chain.Sequence()
 
-	sf := msgprocessor.NewSigFilter(policies.ChannelReaders, chain)
+	sf := NewSigFilter(policies.ChannelReaders, chain)
 	if err := sf.Apply(envelope); err != nil {
 		logger.Warningf("[channel: %s] Received unauthorized deliver request from %s: %s", chdr.ChannelId, addr, err)
 		return sendStatusReply(srv, cb.Status_FORBIDDEN)

orderer/common/deliver/deliver_test.go → common/deliver/deliver_test.go

@@ -23,11 +23,11 @@ import (
 	"time"
 
 	"github.com/hyperledger/fabric/common/flogging"
+	"github.com/hyperledger/fabric/common/ledger/blockledger"
+	ramledger "github.com/hyperledger/fabric/common/ledger/blockledger/ram"
 	mockpolicies "github.com/hyperledger/fabric/common/mocks/policies"
 	"github.com/hyperledger/fabric/common/policies"
 	genesisconfig "github.com/hyperledger/fabric/common/tools/configtxgen/localconfig"
-	"github.com/hyperledger/fabric/orderer/common/ledger"
-	ramledger "github.com/hyperledger/fabric/orderer/common/ledger/ram"
 	cb "github.com/hyperledger/fabric/protos/common"
 	ab "github.com/hyperledger/fabric/protos/orderer"
 	"github.com/hyperledger/fabric/protos/utils"
@@ -120,7 +120,7 @@ func (mm *mockSupportManager) GetChain(chainID string) (Support, bool) {
 }
 
 type mockSupport struct {
-	ledger        ledger.ReadWriter
+	ledger        blockledger.ReadWriter
 	policyManager *mockpolicies.Manager
 	erroredChan   chan struct{}
 	configSeq     uint64
@@ -138,11 +138,11 @@ func (mcs *mockSupport) PolicyManager() policies.Manager {
 	return mcs.policyManager
 }
 
-func (mcs *mockSupport) Reader() ledger.Reader {
+func (mcs *mockSupport) Reader() blockledger.Reader {
 	return mcs.ledger
 }
 
-func NewRAMLedger() ledger.ReadWriter {
+func NewRAMLedger() blockledger.ReadWriter {
 	rlf := ramledger.New(ledgerSize + 1)
 	rl, _ := rlf.GetOrCreate(genesisconfig.TestChainID)
 	rl.Append(genesisBlock)
@@ -153,7 +153,7 @@ func initializeDeliverHandler() Handler {
 	mm := newMockMultichainManager()
 	for i := 1; i < ledgerSize; i++ {
 		l := mm.chains[systemChainID].ledger
-		l.Append(ledger.CreateNextBlock(l, []*cb.Envelope{{Payload: []byte(fmt.Sprintf("%d", i))}}))
+		l.Append(blockledger.CreateNextBlock(l, []*cb.Envelope{{Payload: []byte(fmt.Sprintf("%d", i))}}))
 	}
 
 	return NewHandlerImpl(mm)
@@ -282,7 +282,7 @@ func TestUnauthorizedSeek(t *testing.T) {
 	mm := newMockMultichainManager()
 	for i := 1; i < ledgerSize; i++ {
 		l := mm.chains[systemChainID].ledger
-		l.Append(ledger.CreateNextBlock(l, []*cb.Envelope{{Payload: []byte(fmt.Sprintf("%d", i))}}))
+		l.Append(blockledger.CreateNextBlock(l, []*cb.Envelope{{Payload: []byte(fmt.Sprintf("%d", i))}}))
 	}
 	mm.chains[systemChainID].policyManager.Policy.Err = fmt.Errorf("Fail to evaluate policy")
 
@@ -308,7 +308,7 @@ func TestRevokedAuthorizationSeek(t *testing.T) {
 	mm := newMockMultichainManager()
 	for i := 1; i < ledgerSize; i++ {
 		l := mm.chains[systemChainID].ledger
-		l.Append(ledger.CreateNextBlock(l, []*cb.Envelope{{Payload: []byte(fmt.Sprintf("%d", i))}}))
+		l.Append(blockledger.CreateNextBlock(l, []*cb.Envelope{{Payload: []byte(fmt.Sprintf("%d", i))}}))
 	}
 
 	m := newMockD()
@@ -329,7 +329,7 @@ func TestRevokedAuthorizationSeek(t *testing.T) {
 	mm.chains[systemChainID].policyManager.Policy.Err = fmt.Errorf("Fail to evaluate policy")
 	mm.chains[systemChainID].configSeq++
 	l := mm.chains[systemChainID].ledger
-	l.Append(ledger.CreateNextBlock(l, []*cb.Envelope{{Payload: []byte(fmt.Sprintf("%d", ledgerSize+1))}}))
+	l.Append(blockledger.CreateNextBlock(l, []*cb.Envelope{{Payload: []byte(fmt.Sprintf("%d", ledgerSize+1))}}))
 
 	select {
 	case deliverReply := <-m.sendChan:
@@ -391,7 +391,7 @@ func TestBlockingSeek(t *testing.T) {
 	mm := newMockMultichainManager()
 	for i := 1; i < ledgerSize; i++ {
 		l := mm.chains[systemChainID].ledger
-		l.Append(ledger.CreateNextBlock(l, []*cb.Envelope{{Payload: []byte(fmt.Sprintf("%d", i))}}))
+		l.Append(blockledger.CreateNextBlock(l, []*cb.Envelope{{Payload: []byte(fmt.Sprintf("%d", i))}}))
 	}
 
 	m := newMockD()
@@ -418,7 +418,7 @@ func TestBlockingSeek(t *testing.T) {
 	}
 
 	l := mm.chains[systemChainID].ledger
-	l.Append(ledger.CreateNextBlock(l, []*cb.Envelope{{Payload: []byte(fmt.Sprintf("%d", ledgerSize+1))}}))
+	l.Append(blockledger.CreateNextBlock(l, []*cb.Envelope{{Payload: []byte(fmt.Sprintf("%d", ledgerSize+1))}}))
 
 	select {
 	case deliverReply := <-m.sendChan:
@@ -445,7 +445,7 @@ func TestErroredSeek(t *testing.T) {
 	l := ms.ledger
 	close(ms.erroredChan)
 	for i := 1; i < ledgerSize; i++ {
-		l.Append(ledger.CreateNextBlock(l, []*cb.Envelope{{Payload: []byte(fmt.Sprintf("%d", i))}}))
+		l.Append(blockledger.CreateNextBlock(l, []*cb.Envelope{{Payload: []byte(fmt.Sprintf("%d", i))}}))
 	}
 
 	m := newMockD()
@@ -469,7 +469,7 @@ func TestErroredBlockingSeek(t *testing.T) {
 	ms := mm.chains[systemChainID]
 	l := ms.ledger
 	for i := 1; i < ledgerSize; i++ {
-		l.Append(ledger.CreateNextBlock(l, []*cb.Envelope{{Payload: []byte(fmt.Sprintf("%d", i))}}))
+		l.Append(blockledger.CreateNextBlock(l, []*cb.Envelope{{Payload: []byte(fmt.Sprintf("%d", i))}}))
 	}
 
 	m := newMockD()

orderer/common/msgprocessor/sigfilter.go → common/deliver/sigfilter.go

@@ -4,7 +4,7 @@ Copyright IBM Corp. All Rights Reserved.
 SPDX-License-Identifier: Apache-2.0
 */
 
-package msgprocessor
+package deliver
 
 import (
 	"fmt"
@@ -15,28 +15,34 @@ import (
 	"github.com/pkg/errors"
 )
 
+// ErrPermissionDenied is returned by errors which are caused by transactions
+// which are not permitted due to an authorization failure.
+var ErrPermissionDenied = errors.New("permission denied")
+
 // SigFilterSupport provides the resources required for the signature filter
 type SigFilterSupport interface {
 	// PolicyManager returns a reference to the current policy manager
 	PolicyManager() policies.Manager
 }
 
-type sigFilter struct {
+// SigFilter stores the name of the policy to apply to deliver requests to
+// determine whether a client is authorized
+type SigFilter struct {
 	policyName string
 	support    SigFilterSupport
 }
 
 // NewSigFilter creates a new signature filter, at every evaluation, the policy manager is called
 // to retrieve the latest version of the policy
-func NewSigFilter(policyName string, support SigFilterSupport) Rule {
-	return &sigFilter{
+func NewSigFilter(policyName string, support SigFilterSupport) *SigFilter {
+	return &SigFilter{
 		policyName: policyName,
 		support:    support,
 	}
 }
 
 // Apply applies the policy given, resulting in Reject or Forward, never Accept
-func (sf *sigFilter) Apply(message *cb.Envelope) error {
+func (sf *SigFilter) Apply(message *cb.Envelope) error {
 	signedData, err := message.AsSignedData()
 
 	if err != nil {

orderer/common/msgprocessor/sigfilter_test.go → common/deliver/sigfilter_test.go

@@ -4,7 +4,7 @@ Copyright IBM Corp. All Rights Reserved.
 SPDX-License-Identifier: Apache-2.0
 */
 
-package msgprocessor
+package deliver
 
 import (
 	"fmt"

orderer/common/ledger/blackbox_test.go → common/ledger/blockledger/blackbox_test.go

@@ -14,14 +14,15 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package ledger_test
+package blockledger_test
 
 import (
 	"bytes"
 	"reflect"
 	"testing"
 
-	. "github.com/hyperledger/fabric/orderer/common/ledger"
+	"github.com/hyperledger/fabric/common/ledger/blockledger"
+
 	cb "github.com/hyperledger/fabric/protos/common"
 	ab "github.com/hyperledger/fabric/protos/orderer"
 )
@@ -32,7 +33,7 @@ type ledgerTestable interface {
 }
 
 type ledgerTestFactory interface {
-	New() (Factory, ReadWriter)
+	New() (blockledger.Factory, blockledger.ReadWriter)
 	Destroy() error
 	Persistent() bool
 }
@@ -69,7 +70,7 @@ func testInitialization(lf ledgerTestFactory, t *testing.T) {
 	if li.Height() != 1 {
 		t.Fatalf("Block height should be 1")
 	}
-	block := GetBlock(li, 0)
+	block := blockledger.GetBlock(li, 0)
 	if block == nil {
 		t.Fatalf("Error retrieving genesis block")
 	}
@@ -86,7 +87,7 @@ func testReinitialization(lf ledgerTestFactory, t *testing.T) {
 		return
 	}
 	olf, oli := lf.New()
-	aBlock := CreateNextBlock(oli, []*cb.Envelope{{Payload: []byte("My Data")}})
+	aBlock := blockledger.CreateNextBlock(oli, []*cb.Envelope{{Payload: []byte("My Data")}})
 	err := oli.Append(aBlock)
 	if err != nil {
 		t.Fatalf("Error appending block: %s", err)
@@ -97,7 +98,7 @@ func testReinitialization(lf ledgerTestFactory, t *testing.T) {
 	if li.Height() != 2 {
 		t.Fatalf("Block height should be 2")
 	}
-	block := GetBlock(li, 1)
+	block := blockledger.GetBlock(li, 1)
 	if block == nil {
 		t.Fatalf("Error retrieving block 1")
 	}
@@ -112,17 +113,17 @@ func TestAddition(t *testing.T) {
 
 func testAddition(lf ledgerTestFactory, t *testing.T) {
 	_, li := lf.New()
-	genesis := GetBlock(li, 0)
+	genesis := blockledger.GetBlock(li, 0)
 	if genesis == nil {
 		t.Fatalf("Could not retrieve genesis block")
 	}
 	prevHash := genesis.Header.Hash()
 
-	li.Append(CreateNextBlock(li, []*cb.Envelope{{Payload: []byte("My Data")}}))
+	li.Append(blockledger.CreateNextBlock(li, []*cb.Envelope{{Payload: []byte("My Data")}}))
 	if li.Height() != 2 {
 		t.Fatalf("Block height should be 2")
 	}
-	block := GetBlock(li, 1)
+	block := blockledger.GetBlock(li, 1)
 	if block == nil {
 		t.Fatalf("Error retrieving genesis block")
 	}
@@ -137,7 +138,7 @@ func TestRetrieval(t *testing.T) {
 
 func testRetrieval(lf ledgerTestFactory, t *testing.T) {
 	_, li := lf.New()
-	li.Append(CreateNextBlock(li, []*cb.Envelope{{Payload: []byte("My Data")}}))
+	li.Append(blockledger.CreateNextBlock(li, []*cb.Envelope{{Payload: []byte("My Data")}}))
 	it, num := li.Iterator(&ab.SeekPosition{Type: &ab.SeekPosition_Oldest{}})
 	defer it.Close()
 	if num != 0 {
@@ -188,7 +189,7 @@ func testBlockedRetrieval(lf ledgerTestFactory, t *testing.T) {
 		t.Fatalf("Should not be ready for block read")
 	default:
 	}
-	li.Append(CreateNextBlock(li, []*cb.Envelope{{Payload: []byte("My Data")}}))
+	li.Append(blockledger.CreateNextBlock(li, []*cb.Envelope{{Payload: []byte("My Data")}}))
 	select {
 	case <-signal:
 	default:
@@ -222,8 +223,8 @@ func testMultichain(lf ledgerTestFactory, t *testing.T) {
 		t.Fatalf("Error creating chain1: %s", err)
 	}
 
-	c1.Append(CreateNextBlock(c1, []*cb.Envelope{{Payload: c1p1}}))
-	c1b1 := CreateNextBlock(c1, []*cb.Envelope{{Payload: c1p2}})
+	c1.Append(blockledger.CreateNextBlock(c1, []*cb.Envelope{{Payload: c1p1}}))
+	c1b1 := blockledger.CreateNextBlock(c1, []*cb.Envelope{{Payload: c1p2}})
 	c1.Append(c1b1)
 
 	if c1.Height() != 2 {
@@ -234,7 +235,7 @@ func testMultichain(lf ledgerTestFactory, t *testing.T) {
 	if err != nil {
 		t.Fatalf("Error creating chain2: %s", err)
 	}
-	c2b0 := c2.Append(CreateNextBlock(c2, []*cb.Envelope{{Payload: c2p1}}))
+	c2b0 := c2.Append(blockledger.CreateNextBlock(c2, []*cb.Envelope{{Payload: c2p1}}))
 
 	if c2.Height() != 1 {
 		t.Fatalf("Block height for c2 should be 1")
@@ -245,7 +246,7 @@ func testMultichain(lf ledgerTestFactory, t *testing.T) {
 		t.Fatalf("Error retrieving chain1: %s", err)
 	}
 
-	if b := GetBlock(c1, 1); !reflect.DeepEqual(c1b1, b) {
+	if b := blockledger.GetBlock(c1, 1); !reflect.DeepEqual(c1b1, b) {
 		t.Fatalf("Did not properly store block 1 on chain 1:")
 	}
 
@@ -254,7 +255,7 @@ func testMultichain(lf ledgerTestFactory, t *testing.T) {
 		t.Fatalf("Error retrieving chain2: %s", err)
 	}
 
-	if b := GetBlock(c2, 0); reflect.DeepEqual(c2b0, b) {
+	if b := blockledger.GetBlock(c2, 0); reflect.DeepEqual(c2b0, b) {
 		t.Fatalf("Did not properly store block 1 on chain 1")
 	}
 }

orderer/common/ledger/file/factory.go → common/ledger/blockledger/file/factory.go

@@ -21,17 +21,17 @@ import (
 
 	"github.com/hyperledger/fabric/common/ledger/blkstorage"
 	"github.com/hyperledger/fabric/common/ledger/blkstorage/fsblkstorage"
-	"github.com/hyperledger/fabric/orderer/common/ledger"
+	"github.com/hyperledger/fabric/common/ledger/blockledger"
 )
 
 type fileLedgerFactory struct {
 	blkstorageProvider blkstorage.BlockStoreProvider
-	ledgers            map[string]ledger.ReadWriter
+	ledgers            map[string]blockledger.ReadWriter
 	mutex              sync.Mutex
 }
 
 // GetOrCreate gets an existing ledger (if it exists) or creates it if it does not
-func (flf *fileLedgerFactory) GetOrCreate(chainID string) (ledger.ReadWriter, error) {
+func (flf *fileLedgerFactory) GetOrCreate(chainID string) (blockledger.ReadWriter, error) {
 	flf.mutex.Lock()
 	defer flf.mutex.Unlock()
 
@@ -66,13 +66,13 @@ func (flf *fileLedgerFactory) Close() {
 }
 
 // New creates a new ledger factory
-func New(directory string) ledger.Factory {
+func New(directory string) blockledger.Factory {
 	return &fileLedgerFactory{
 		blkstorageProvider: fsblkstorage.NewProvider(
 			fsblkstorage.NewConf(directory, -1),
 			&blkstorage.IndexConfig{
 				AttrsToIndex: []blkstorage.IndexableAttr{blkstorage.IndexableAttrBlockNum}},
 		),
-		ledgers: make(map[string]ledger.ReadWriter),
+		ledgers: make(map[string]blockledger.ReadWriter),
 	}
 }

orderer/common/ledger/file/factory_test.go → common/ledger/blockledger/file/factory_test.go

@@ -22,8 +22,8 @@ import (
 	"testing"
 
 	"github.com/hyperledger/fabric/common/ledger/blkstorage"
+	"github.com/hyperledger/fabric/common/ledger/blockledger"
 	genesisconfig "github.com/hyperledger/fabric/common/tools/configtxgen/localconfig"
-	"github.com/hyperledger/fabric/orderer/common/ledger"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -56,7 +56,7 @@ func (mbsp *mockBlockStoreProvider) Close() {
 func TestBlockstoreProviderError(t *testing.T) {
 	flf := &fileLedgerFactory{
 		blkstorageProvider: &mockBlockStoreProvider{error: fmt.Errorf("blockstorage provider error")},
-		ledgers:            make(map[string]ledger.ReadWriter),
+		ledgers:            make(map[string]blockledger.ReadWriter),
 	}
 	assert.Panics(
 		t,

orderer/common/ledger/file/impl.go → common/ledger/blockledger/file/impl.go

@@ -18,11 +18,12 @@ package fileledger
 
 import (
 	"github.com/hyperledger/fabric/common/flogging"
-	cl "github.com/hyperledger/fabric/common/ledger"
+	"github.com/hyperledger/fabric/common/ledger"
 	"github.com/hyperledger/fabric/common/ledger/blkstorage"
-	ledger "github.com/hyperledger/fabric/orderer/common/ledger"
+	"github.com/hyperledger/fabric/common/ledger/blockledger"
 	cb "github.com/hyperledger/fabric/protos/common"
 	ab "github.com/hyperledger/fabric/protos/orderer"
+
 	"github.com/op/go-logging"
 )
 
@@ -38,6 +39,7 @@ func init() {
 	close(closedChan)
 }
 
+// FileLedger is a struct used to interact with a node's ledger
 type fileLedger struct {
 	blockStore blkstorage.BlockStore
 	signal     chan struct{}
@@ -46,7 +48,7 @@ type fileLedger struct {
 type fileLedgerIterator struct {
 	ledger         *fileLedger
 	blockNumber    uint64
-	commonIterator cl.ResultsIterator
+	commonIterator ledger.ResultsIterator
 }
 
 // Next blocks until there is a new block available, or returns an error if the
@@ -79,9 +81,9 @@ func (i *fileLedgerIterator) Close() {
 	i.commonIterator.Close()
 }
 
-// Iterator returns an Iterator, as specified by a cb.SeekInfo message, and its
+// Iterator returns an Iterator, as specified by an ab.SeekInfo message, and its
 // starting block number
-func (fl *fileLedger) Iterator(startPosition *ab.SeekPosition) (ledger.Iterator, uint64) {
+func (fl *fileLedger) Iterator(startPosition *ab.SeekPosition) (blockledger.Iterator, uint64) {
 	var startingBlockNumber uint64
 	switch start := startPosition.Type.(type) {
 	case *ab.SeekPosition_Oldest:
@@ -97,15 +99,15 @@ func (fl *fileLedger) Iterator(startPosition *ab.SeekPosition) (ledger.Iterator,
 		startingBlockNumber = start.Specified.Number
 		height := fl.Height()
 		if startingBlockNumber > height {
-			return &ledger.NotFoundErrorIterator{}, 0
+			return &blockledger.NotFoundErrorIterator{}, 0
 		}
 	default:
-		return &ledger.NotFoundErrorIterator{}, 0
+		return &blockledger.NotFoundErrorIterator{}, 0
 	}
 
 	iterator, err := fl.blockStore.RetrieveBlocks(startingBlockNumber)
 	if err != nil {
-		return &ledger.NotFoundErrorIterator{}, 0
+		return &blockledger.NotFoundErrorIterator{}, 0
 	}
 
 	return &fileLedgerIterator{ledger: fl, blockNumber: startingBlockNumber, commonIterator: iterator}, startingBlockNumber

orderer/common/ledger/file/impl_test.go → common/ledger/blockledger/file/impl_test.go

@@ -25,8 +25,8 @@ import (
 
 	"github.com/hyperledger/fabric/common/flogging"
 	cl "github.com/hyperledger/fabric/common/ledger"
+	"github.com/hyperledger/fabric/common/ledger/blockledger"
 	genesisconfig "github.com/hyperledger/fabric/common/tools/configtxgen/localconfig"
-	"github.com/hyperledger/fabric/orderer/common/ledger"
 	cb "github.com/hyperledger/fabric/protos/common"
 	ab "github.com/hyperledger/fabric/protos/orderer"
 	"github.com/hyperledger/fabric/protos/peer"
@@ -43,7 +43,7 @@ func init() {
 type testEnv struct {
 	t        *testing.T
 	location string
-	flf      ledger.Factory
+	flf      blockledger.Factory
 }
 
 func initialize(t *testing.T) (*testEnv, *fileLedger) {
@@ -139,7 +139,7 @@ func TestInitialization(t *testing.T) {
 
 	assert.Equal(t, uint64(1), fl.Height(), "Block height should be 1")
 
-	block := ledger.GetBlock(fl, 0)
+	block := blockledger.GetBlock(fl, 0)
 	assert.NotNil(t, block, "Error retrieving genesis block")
 	assert.Equal(t, genesisBlock.Header.Hash(), block.Header.Hash(), "Block hashes did no match")
 }
@@ -149,7 +149,7 @@ func TestReinitialization(t *testing.T) {
 	defer tev.tearDown()
 
 	// create a block to add to the ledger
-	b1 := ledger.CreateNextBlock(ledger1, []*cb.Envelope{{Payload: []byte("My Data")}})
+	b1 := blockledger.CreateNextBlock(ledger1, []*cb.Envelope{{Payload: []byte("My Data")}})
 
 	// add the block to the ledger
 	ledger1.Append(b1)
@@ -180,7 +180,7 @@ func TestReinitialization(t *testing.T) {
 	fl = ledger2.(*fileLedger)
 	assert.Equal(t, uint64(2), fl.Height(), "Block height should be 2. Got %v", fl.Height())
 
-	block := ledger.GetBlock(fl, 1)
+	block := blockledger.GetBlock(fl, 1)
 	assert.NotNil(t, block, "Error retrieving block 1")
 	assert.Equal(t, b1.Header.Hash(), block.Header.Hash(), "Block hashes did no match")
 }
@@ -190,10 +190,10 @@ func TestAddition(t *testing.T) {
 	defer tev.tearDown()
 	info, _ := fl.blockStore.GetBlockchainInfo()
 	prevHash := info.CurrentBlockHash
-	fl.Append(ledger.CreateNextBlock(fl, []*cb.Envelope{{Payload: []byte("My Data")}}))
+	fl.Append(blockledger.CreateNextBlock(fl, []*cb.Envelope{{Payload: []byte("My Data")}}))
 	assert.Equal(t, uint64(2), fl.Height(), "Block height should be 2")
 
-	block := ledger.GetBlock(fl, 1)
+	block := blockledger.GetBlock(fl, 1)
 	assert.NotNil(t, block, "Error retrieving genesis block")
 	assert.Equal(t, prevHash, block.Header.PreviousHash, "Block hashes did no match")
 }
@@ -201,7 +201,7 @@ func TestAddition(t *testing.T) {
 func TestRetrieval(t *testing.T) {
 	tev, fl := initialize(t)
 	defer tev.tearDown()
-	fl.Append(ledger.CreateNextBlock(fl, []*cb.Envelope{{Payload: []byte("My Data")}}))
+	fl.Append(blockledger.CreateNextBlock(fl, []*cb.Envelope{{Payload: []byte("My Data")}}))
 	it, num := fl.Iterator(&ab.SeekPosition{Type: &ab.SeekPosition_Oldest{}})
 	defer it.Close()
 	assert.Zero(t, num, "Expected genesis block iterator, but got %d", num)
@@ -249,8 +249,7 @@ func TestBlockedRetrieval(t *testing.T) {
 		t.Fatalf("Should not be ready for block read")
 	default:
 	}
-
-	fl.Append(ledger.CreateNextBlock(fl, []*cb.Envelope{{Payload: []byte("My Data")}}))
+	fl.Append(blockledger.CreateNextBlock(fl, []*cb.Envelope{{Payload: []byte("My Data")}}))
 	select {
 	case <-signal:
 	default:
@@ -266,7 +265,7 @@ func TestBlockedRetrieval(t *testing.T) {
 		"Expected to successfully retrieve the second block but got block number %d", block.Header.Number)
 
 	go func() {
-		fl.Append(ledger.CreateNextBlock(fl, []*cb.Envelope{{Payload: []byte("My Data")}}))
+		fl.Append(blockledger.CreateNextBlock(fl, []*cb.Envelope{{Payload: []byte("My Data")}}))
 	}()
 	select {
 	case <-it.ReadyChan():
@@ -316,7 +315,7 @@ func TestBlockstoreError(t *testing.T) {
 		defer it.Close()
 		assert.IsType(
 			t,
-			&ledger.NotFoundErrorIterator{},
+			&blockledger.NotFoundErrorIterator{},
 			it,
 			"Expected Not Found Error if seek number is greater than ledger height")
 	}

orderer/common/ledger/file_test.go → common/ledger/blockledger/file_test.go

@@ -14,15 +14,15 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package ledger_test
+package blockledger_test
 
 import (
 	"io/ioutil"
 	"os"
 
+	. "github.com/hyperledger/fabric/common/ledger/blockledger"
+	fileledger "github.com/hyperledger/fabric/common/ledger/blockledger/file"
 	genesisconfig "github.com/hyperledger/fabric/common/tools/configtxgen/localconfig"
-	. "github.com/hyperledger/fabric/orderer/common/ledger"
-	fileledger "github.com/hyperledger/fabric/orderer/common/ledger/file"
 )
 
 func init() {

orderer/common/ledger/json/factory.go → common/ledger/blockledger/json/factory.go

@@ -24,17 +24,17 @@ import (
 	"sync"
 
 	"github.com/golang/protobuf/jsonpb"
-	"github.com/hyperledger/fabric/orderer/common/ledger"
+	"github.com/hyperledger/fabric/common/ledger/blockledger"
 )
 
 type jsonLedgerFactory struct {
 	directory string
-	ledgers   map[string]ledger.ReadWriter
+	ledgers   map[string]blockledger.ReadWriter
 	mutex     sync.Mutex
 }
 
 // GetOrCreate gets an existing ledger (if it exists) or creates it if it does not
-func (jlf *jsonLedgerFactory) GetOrCreate(chainID string) (ledger.ReadWriter, error) {
+func (jlf *jsonLedgerFactory) GetOrCreate(chainID string) (blockledger.ReadWriter, error) {
 	jlf.mutex.Lock()
 	defer jlf.mutex.Unlock()
 
@@ -60,7 +60,7 @@ func (jlf *jsonLedgerFactory) GetOrCreate(chainID string) (ledger.ReadWriter, er
 }
 
 // newChain creates a new chain backed by a JSON ledger
-func newChain(directory string) ledger.ReadWriter {
+func newChain(directory string) blockledger.ReadWriter {
 	jl := &jsonLedger{
 		directory: directory,
 		signal:    make(chan struct{}),
@@ -128,7 +128,7 @@ func (jlf *jsonLedgerFactory) Close() {
 }
 
 // New creates a new ledger factory
-func New(directory string) ledger.Factory {
+func New(directory string) blockledger.Factory {
 	logger.Debugf("Initializing ledger at: %s", directory)
 	if err := os.MkdirAll(directory, 0700); err != nil {
 		logger.Panicf("Could not create directory %s: %s", directory, err)
@@ -136,7 +136,7 @@ func New(directory string) ledger.Factory {
 
 	jlf := &jsonLedgerFactory{
 		directory: directory,
-