[FAB-8361]: Remove ledger dep. for committer UT

Removes dependency of ledger package from committer UT to enable
test parallezation and to improve execution time.

Change-Id: Ie23c9038ad8f1d5798d79b5f178e6b800a059d2f
Signed-off-by: Artem Barger <bartem@il.ibm.com>

Author: C0rWin

core/committer/committer_test.go

@@ -1,67 +1,155 @@
 /*
-Copyright IBM Corp. 2016 All Rights Reserved.
+Copyright IBM Corp. All Rights Reserved.
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-		 http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+SPDX-License-Identifier: Apache-2.0
 */
 
 package committer
 
 import (
+	"errors"
 	"sync/atomic"
 	"testing"
 
 	"github.com/hyperledger/fabric/common/configtx/test"
+	"github.com/hyperledger/fabric/common/ledger"
 	"github.com/hyperledger/fabric/common/ledger/testutil"
 	"github.com/hyperledger/fabric/common/tools/configtxgen/encoder"
 	"github.com/hyperledger/fabric/common/tools/configtxgen/localconfig"
-	"github.com/hyperledger/fabric/common/util"
 	ledger2 "github.com/hyperledger/fabric/core/ledger"
-	"github.com/hyperledger/fabric/core/ledger/ledgermgmt"
 	"github.com/hyperledger/fabric/protos/common"
-	"github.com/spf13/viper"
+	"github.com/hyperledger/fabric/protos/peer"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
 )
 
+type mockLedger struct {
+	height       uint64
+	currentHash  []byte
+	previousHash []byte
+	mock.Mock
+}
+
+func (m *mockLedger) GetBlockchainInfo() (*common.BlockchainInfo, error) {
+	info := &common.BlockchainInfo{
+		Height:            m.height,
+		CurrentBlockHash:  m.currentHash,
+		PreviousBlockHash: m.previousHash,
+	}
+	return info, nil
+}
+
+func (m *mockLedger) GetBlockByNumber(blockNumber uint64) (*common.Block, error) {
+	args := m.Called(blockNumber)
+	return args.Get(0).(*common.Block), args.Error(1)
+}
+
+func (m *mockLedger) GetBlocksIterator(startBlockNumber uint64) (ledger.ResultsIterator, error) {
+	args := m.Called(startBlockNumber)
+	return args.Get(0).(ledger.ResultsIterator), args.Error(1)
+}
+
+func (m *mockLedger) Close() {
+
+}
+
+func (m *mockLedger) GetTransactionByID(txID string) (*peer.ProcessedTransaction, error) {
+	args := m.Called(txID)
+	return args.Get(0).(*peer.ProcessedTransaction), args.Error(1)
+}
+
+func (m *mockLedger) GetBlockByHash(blockHash []byte) (*common.Block, error) {
+	args := m.Called(blockHash)
+	return args.Get(0).(*common.Block), args.Error(1)
+}
+
+func (m *mockLedger) GetBlockByTxID(txID string) (*common.Block, error) {
+	args := m.Called(txID)
+	return args.Get(0).(*common.Block), args.Error(1)
+}
+
+func (m *mockLedger) GetTxValidationCodeByTxID(txID string) (peer.TxValidationCode, error) {
+	args := m.Called(txID)
+	return args.Get(0).(peer.TxValidationCode), args.Error(1)
+}
+
+func (m *mockLedger) NewTxSimulator(txid string) (ledger2.TxSimulator, error) {
+	args := m.Called(txid)
+	return args.Get(0).(ledger2.TxSimulator), args.Error(1)
+}
+
+func (m *mockLedger) NewQueryExecutor() (ledger2.QueryExecutor, error) {
+	args := m.Called()
+	return args.Get(0).(ledger2.QueryExecutor), args.Error(1)
+}
+
+func (m *mockLedger) NewHistoryQueryExecutor() (ledger2.HistoryQueryExecutor, error) {
+	args := m.Called()
+	return args.Get(0).(ledger2.HistoryQueryExecutor), args.Error(1)
+}
+
+func (m *mockLedger) GetPvtDataAndBlockByNum(blockNum uint64, filter ledger2.PvtNsCollFilter) (*ledger2.BlockAndPvtData, error) {
+	args := m.Called(blockNum, filter)
+	return args.Get(0).(*ledger2.BlockAndPvtData), args.Error(1)
+}
+
+func (m *mockLedger) GetPvtDataByNum(blockNum uint64, filter ledger2.PvtNsCollFilter) ([]*ledger2.TxPvtData, error) {
+	args := m.Called(blockNum, filter)
+	return args.Get(0).([]*ledger2.TxPvtData), args.Error(1)
+}
+
+func (m *mockLedger) CommitWithPvtData(blockAndPvtdata *ledger2.BlockAndPvtData) error {
+	m.height += 1
+	m.previousHash = m.currentHash
+	m.currentHash = blockAndPvtdata.Block.Header.DataHash
+	args := m.Called(blockAndPvtdata)
+	return args.Error(0)
+}
+
+func (m *mockLedger) PurgePrivateData(maxBlockNumToRetain uint64) error {
+	args := m.Called(maxBlockNumToRetain)
+	return args.Error(0)
+}
+
+func (m *mockLedger) PrivateDataMinBlockNum() (uint64, error) {
+	args := m.Called()
+	return args.Get(0).(uint64), args.Error(1)
+}
+
+func (m *mockLedger) Prune(policy ledger.PrunePolicy) error {
+	args := m.Called(policy)
+	return args.Error(0)
+}
+
+func createLedger(channelID string) (*common.Block, *mockLedger) {
+	gb, _ := test.MakeGenesisBlock(channelID)
+	ledger := &mockLedger{
+		height:       1,
+		previousHash: []byte{},
+		currentHash:  gb.Header.DataHash,
+	}
+	return gb, ledger
+}
+
 func TestKVLedgerBlockStorage(t *testing.T) {
-	viper.Set("peer.fileSystemPath", "/tmp/fabric/committertest")
-	ledgermgmt.InitializeTestEnv()
-	defer ledgermgmt.CleanupTestEnv()
-	gb, _ := test.MakeGenesisBlock("TestLedger")
-	gbHash := gb.Header.Hash()
-	ledger, err := ledgermgmt.CreateLedger(gb)
-	assert.NoError(t, err, "Error while creating ledger: %s", err)
-	defer ledger.Close()
+	t.Parallel()
+	gb, ledger := createLedger("TestLedger")
+	block1 := testutil.ConstructBlock(t, 1, gb.Header.DataHash, [][]byte{{1, 2, 3, 4}, {5, 6, 7, 8}}, true)
+
+	ledger.On("CommitWithPvtData", mock.Anything).Run(func(args mock.Arguments) {
+		b := args.Get(0).(*ledger2.BlockAndPvtData)
+		assert.Equal(t, uint64(1), b.Block.Header.GetNumber())
+		assert.Equal(t, gb.Header.DataHash, b.Block.Header.PreviousHash)
+		assert.Equal(t, block1.Header.DataHash, b.Block.Header.DataHash)
+	}).Return(nil)
+
+	ledger.On("GetBlockByNumber", uint64(0)).Return(gb, nil)
 
 	committer := NewLedgerCommitter(ledger)
 	height, err := committer.LedgerHeight()
 	assert.Equal(t, uint64(1), height)
 	assert.NoError(t, err)
 
-	bcInfo, _ := ledger.GetBlockchainInfo()
-	testutil.AssertEquals(t, bcInfo, &common.BlockchainInfo{
-		Height: 1, CurrentBlockHash: gbHash, PreviousBlockHash: nil})
-
-	txid := util.GenerateUUID()
-	simulator, _ := ledger.NewTxSimulator(txid)
-	simulator.SetState("ns1", "key1", []byte("value1"))
-	simulator.SetState("ns1", "key2", []byte("value2"))
-	simulator.SetState("ns1", "key3", []byte("value3"))
-	simulator.Done()
-
-	simRes, _ := simulator.GetTxSimulationResults()
-	simResBytes, _ := simRes.GetPubSimulationBytes()
-	block1 := testutil.ConstructBlock(t, 1, gbHash, [][]byte{simResBytes}, true)
-
 	err = committer.CommitWithPvtData(&ledger2.BlockAndPvtData{
 		Block: block1,
 	})
@@ -74,25 +162,13 @@ func TestKVLedgerBlockStorage(t *testing.T) {
 	blocks := committer.GetBlocks([]uint64{0})
 	assert.Equal(t, 1, len(blocks))
 	assert.NoError(t, err)
-
-	bcInfo, _ = ledger.GetBlockchainInfo()
-	block1Hash := block1.Header.Hash()
-	testutil.AssertEquals(t, bcInfo, &common.BlockchainInfo{
-		Height: 2, CurrentBlockHash: block1Hash, PreviousBlockHash: gbHash})
 }
 
 func TestNewLedgerCommitterReactive(t *testing.T) {
-	viper.Set("peer.fileSystemPath", "/tmp/fabric/committertest")
+	t.Parallel()
 	chainID := "TestLedger"
-
-	ledgermgmt.InitializeTestEnv()
-	defer ledgermgmt.CleanupTestEnv()
-	gb, _ := test.MakeGenesisBlock(chainID)
-
-	ledger, err := ledgermgmt.CreateLedger(gb)
-	assert.NoError(t, err, "Error while creating ledger: %s", err)
-	defer ledger.Close()
-
+	_, ledger := createLedger(chainID)
+	ledger.On("CommitWithPvtData", mock.Anything).Return(nil)
 	var configArrived int32
 	committer := NewLedgerCommitterReactive(ledger, func(_ *common.Block) error {
 		atomic.AddInt32(&configArrived, 1)
@@ -106,8 +182,34 @@ func TestNewLedgerCommitterReactive(t *testing.T) {
 	profile := localconfig.Load(localconfig.SampleSingleMSPSoloProfile)
 	block := encoder.New(profile).GenesisBlockForChannel(chainID)
 
-	committer.CommitWithPvtData(&ledger2.BlockAndPvtData{
+	err = committer.CommitWithPvtData(&ledger2.BlockAndPvtData{
 		Block: block,
 	})
+	assert.NoError(t, err)
 	assert.Equal(t, int32(1), atomic.LoadInt32(&configArrived))
 }
+
+func TestNewLedgerCommitterReactiveFailedConfigUpdate(t *testing.T) {
+	t.Parallel()
+	chainID := "TestLedger"
+	_, ledger := createLedger(chainID)
+	ledger.On("CommitWithPvtData", mock.Anything).Return(nil)
+	var configArrived int32
+	committer := NewLedgerCommitterReactive(ledger, func(_ *common.Block) error {
+		return errors.New("failed update config")
+	})
+
+	height, err := committer.LedgerHeight()
+	assert.Equal(t, uint64(1), height)
+	assert.NoError(t, err)
+
+	profile := localconfig.Load(localconfig.SampleSingleMSPSoloProfile)
+	block := encoder.New(profile).GenesisBlockForChannel(chainID)
+
+	err = committer.CommitWithPvtData(&ledger2.BlockAndPvtData{
+		Block: block,
+	})
+
+	assert.Error(t, err)
+	assert.Equal(t, int32(0), atomic.LoadInt32(&configArrived))
+}