Merge 0a981e6 into b7dd36b

dataRetriever/blockchain/blockchain_test.go

@@ -5,6 +5,7 @@ import (
 	"testing"
 
 	"github.com/multiversx/mx-chain-core-go/core/check"
+	"github.com/multiversx/mx-chain-core-go/data"
 	"github.com/multiversx/mx-chain-core-go/data/block"
 	"github.com/multiversx/mx-chain-core-go/data/mock"
 	"github.com/stretchr/testify/assert"
@@ -81,3 +82,14 @@ func TestBlockChain_SettersAndGettersNilValues(t *testing.T) {
 	assert.Nil(t, bc.GetCurrentBlockHeader())
 	assert.Empty(t, bc.GetCurrentBlockRootHash())
 }
+
+func TestBlockChain_SettersInvalidValues(t *testing.T) {
+	t.Parallel()
+
+	bc, _ := NewBlockChain(&mock.AppStatusHandlerStub{})
+	err := bc.SetGenesisHeader(&block.MetaBlock{})
+	assert.Equal(t, err, data.ErrInvalidHeaderType)
+
+	err = bc.SetCurrentBlockHeaderAndRootHash(&block.MetaBlock{}, []byte("root hash"))
+	assert.Equal(t, err, data.ErrInvalidHeaderType)
+}

dataRetriever/blockchain/metachain_test.go

@@ -82,3 +82,14 @@ func TestMetaChain_SettersAndGettersNilValues(t *testing.T) {
 	assert.Nil(t, mc.GetCurrentBlockHeader())
 	assert.Empty(t, mc.GetCurrentBlockRootHash())
 }
+
+func TestMetaChain_SettersInvalidValues(t *testing.T) {
+	t.Parallel()
+
+	bc, _ := NewMetaChain(&mock.AppStatusHandlerStub{})
+	err := bc.SetGenesisHeader(&block.Header{})
+	assert.Equal(t, err, ErrWrongTypeInSet)
+
+	err = bc.SetCurrentBlockHeaderAndRootHash(&block.Header{}, []byte("root hash"))
+	assert.Equal(t, err, ErrWrongTypeInSet)
+}

dataRetriever/chainStorer_test.go

@@ -239,6 +239,9 @@ func TestBlockChain_GetStorer(t *testing.T) {
 	assert.True(t, peerBlockUnit == storer)
 	storer, _ = b.GetStorer(4)
 	assert.True(t, headerUnit == storer)
+	storer, err := b.GetStorer(5)
+	assert.True(t, errors.Is(err, dataRetriever.ErrStorerNotFound))
+	assert.Nil(t, storer)
 }
 
 func TestBlockChain_GetAllStorers(t *testing.T) {

dataRetriever/dataPool/dataPool_test.go

@@ -209,6 +209,7 @@ func TestNewDataPool_OkValsShouldWork(t *testing.T) {
 	assert.True(t, args.SmartContracts == tdp.SmartContracts())
 	assert.True(t, args.PeerAuthentications == tdp.PeerAuthentications())
 	assert.True(t, args.Heartbeats == tdp.Heartbeats())
+	assert.True(t, args.ValidatorsInfo == tdp.ValidatorsInfo())
 }
 
 func TestNewDataPool_Close(t *testing.T) {

dataRetriever/dataPool/headersCache/headersCache.go

@@ -53,7 +53,7 @@ func (cache *headersCache) addHeader(headerHash []byte, header data.HeaderHandle
 	return true
 }
 
-//tryToDoEviction will check if pool is full and if it is will do eviction
+// tryToDoEviction will check if pool is full and if so, it will do the eviction
 func (cache *headersCache) tryToDoEviction(shardId uint32) {
 	numHeaders := cache.getNumHeaders(shardId)
 	if int(numHeaders) >= cache.maxHeadersPerShard {

dataRetriever/dataPool/headersCache/headersPool_test.go

@@ -1,6 +1,7 @@
 package headersCache_test
 
 import (
+	"errors"
 	"fmt"
 	"sort"
 	"sync"
@@ -16,6 +17,45 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
+func TestNewHeadersCacher(t *testing.T) {
+	t.Parallel()
+
+	t.Run("invalid MaxHeadersPerShard should error", testNewHeadersCacher(
+		config.HeadersPoolConfig{
+			MaxHeadersPerShard: 0,
+		}))
+	t.Run("invalid NumElementsToRemoveOnEviction should error", testNewHeadersCacher(
+		config.HeadersPoolConfig{
+			MaxHeadersPerShard:            1,
+			NumElementsToRemoveOnEviction: 0,
+		}))
+	t.Run("invalid config should error", testNewHeadersCacher(
+		config.HeadersPoolConfig{
+			MaxHeadersPerShard:            1,
+			NumElementsToRemoveOnEviction: 3,
+		}))
+	t.Run("should work", func(t *testing.T) {
+		t.Parallel()
+
+		headersCacher, err := headersCache.NewHeadersPool(config.HeadersPoolConfig{
+			MaxHeadersPerShard:            2,
+			NumElementsToRemoveOnEviction: 1,
+		})
+		require.NoError(t, err)
+		require.NotNil(t, headersCacher)
+	})
+}
+
+func testNewHeadersCacher(cfg config.HeadersPoolConfig) func(t *testing.T) {
+	return func(t *testing.T) {
+		t.Parallel()
+
+		headersCacher, err := headersCache.NewHeadersPool(cfg)
+		require.True(t, errors.Is(err, headersCache.ErrInvalidHeadersCacheParameter))
+		require.Nil(t, headersCacher)
+	}
+}
+
 func TestNewHeadersCacher_AddHeadersInCache(t *testing.T) {
 	t.Parallel()
 
@@ -28,11 +68,16 @@ func TestNewHeadersCacher_AddHeadersInCache(t *testing.T) {
 	nonce := uint64(1)
 	shardId := uint32(0)
 
+	headers, _, err := headersCacher.GetHeadersByNonceAndShardId(nonce, shardId)
+	require.Equal(t, headersCache.ErrHeaderNotFound, err)
+	require.Nil(t, headers)
+
 	headerHash1 := []byte("hash1")
 	headerHash2 := []byte("hash2")
 	testHdr1 := &block.Header{Nonce: nonce, ShardID: shardId}
 	testHdr2 := &block.Header{Nonce: nonce, ShardID: shardId, Round: 100}
 
+	headersCacher.AddHeader([]byte("nil header hash"), nil) // coverage
 	headersCacher.AddHeader(headerHash1, testHdr1)
 	headersCacher.AddHeader(headerHash2, testHdr2)
 
@@ -45,7 +90,7 @@ func TestNewHeadersCacher_AddHeadersInCache(t *testing.T) {
 	require.Equal(t, testHdr2, header)
 
 	expectedHeaders := []data.HeaderHandler{testHdr1, testHdr2}
-	headers, _, err := headersCacher.GetHeadersByNonceAndShardId(nonce, shardId)
+	headers, _, err = headersCacher.GetHeadersByNonceAndShardId(nonce, shardId)
 	require.Nil(t, err)
 	require.Equal(t, expectedHeaders, headers)
 }
@@ -70,6 +115,8 @@ func Test_RemoveHeaderByHash(t *testing.T) {
 	headersCacher.AddHeader(headerHash1, testHdr1)
 	headersCacher.AddHeader(headerHash2, testHdr2)
 
+	headersCacher.RemoveHeaderByHash([]byte(""))
+	headersCacher.RemoveHeaderByHash([]byte("missing hash"))
 	headersCacher.RemoveHeaderByHash(headerHash1)
 	header, err := headersCacher.GetHeaderByHash(headerHash1)
 	require.Nil(t, header)
@@ -101,6 +148,8 @@ func TestHeadersCacher_AddHeadersInCacheAndRemoveByNonceAndShardId(t *testing.T)
 	headersCacher.AddHeader(headerHash1, testHdr1)
 	headersCacher.AddHeader(headerHash2, testHdr2)
 
+	headersCacher.RemoveHeaderByNonceAndShardId(nonce, 100)
+	headersCacher.RemoveHeaderByNonceAndShardId(100, shardId)
 	headersCacher.RemoveHeaderByNonceAndShardId(nonce, shardId)
 	header, err := headersCacher.GetHeaderByHash(headerHash1)
 	require.Nil(t, header)
@@ -577,6 +626,7 @@ func TestHeadersPool_RegisterHandler(t *testing.T) {
 		wasCalled = true
 		wg.Done()
 	}
+	headersCacher.RegisterHandler(nil)
 	headersCacher.RegisterHandler(handler)
 	header, hash := createASliceOfHeaders(1, 0)
 	headersCacher.AddHeader(hash[0], &header[0])
@@ -603,6 +653,25 @@ func TestHeadersPool_Clear(t *testing.T) {
 	require.Equal(t, 0, headersCacher.GetNumHeaders(0))
 }
 
+func TestHeadersPool_IsInterfaceNil(t *testing.T) {
+	t.Parallel()
+
+	headersCacher, _ := headersCache.NewHeadersPool(
+		config.HeadersPoolConfig{
+			MaxHeadersPerShard: 0,
+		},
+	)
+	require.True(t, headersCacher.IsInterfaceNil())
+
+	headersCacher, _ = headersCache.NewHeadersPool(
+		config.HeadersPoolConfig{
+			MaxHeadersPerShard:            1000,
+			NumElementsToRemoveOnEviction: 10,
+		},
+	)
+	require.False(t, headersCacher.IsInterfaceNil())
+}
+
 func createASliceOfHeaders(numHeaders int, shardId uint32) ([]block.Header, [][]byte) {
 	headers := make([]block.Header, 0)
 	headersHashes := make([][]byte, 0)

dataRetriever/factory/containers/resolversContainer_test.go

@@ -251,7 +251,7 @@ func TestResolversContainer_IterateNilHandlerShouldNotPanic(t *testing.T) {
 	defer func() {
 		r := recover()
 		if r != nil {
-			assert.Fail(t, "should not have paniced")
+			assert.Fail(t, "should not have panicked")
 		}
 	}()
 
@@ -269,7 +269,7 @@ func TestResolversContainer_IterateNotAValidKeyShouldWorkAndNotPanic(t *testing.
 	defer func() {
 		r := recover()
 		if r != nil {
-			assert.Fail(t, "should not have paniced")
+			assert.Fail(t, "should not have panicked")
 		}
 	}()
 
@@ -292,7 +292,7 @@ func TestResolversContainer_IterateNotAValidValueShouldWorkAndNotPanic(t *testin
 	defer func() {
 		r := recover()
 		if r != nil {
-			assert.Fail(t, "should not have paniced")
+			assert.Fail(t, "should not have panicked")
 		}
 	}()
 

dataRetriever/factory/epochProviders/currentEpochProvidersFactory_test.go

@@ -25,7 +25,7 @@ func TestCreateCurrentEpochProvider_NilCurrentEpochProvider(t *testing.T) {
 	assert.IsType(t, disabled.NewEpochProvider(), cnep)
 }
 
-func TestCreateCurrentEpochProvider_ArithemticEpochProvider(t *testing.T) {
+func TestCreateCurrentEpochProvider_ArithmeticEpochProvider(t *testing.T) {
 	t.Parallel()
 
 	cnep, err := CreateCurrentEpochProvider(

dataRetriever/factory/resolverscontainer/metaResolversContainerFactory_test.go

@@ -5,6 +5,7 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/multiversx/mx-chain-core-go/core"
 	"github.com/multiversx/mx-chain-go/common"
 	"github.com/multiversx/mx-chain-go/dataRetriever"
 	"github.com/multiversx/mx-chain-go/dataRetriever/factory/resolverscontainer"
@@ -88,6 +89,17 @@ func createTriesHolderForMeta() common.TriesHolder {
 
 // ------- NewResolversContainerFactory
 
+func TestNewMetaResolversContainerFactory_NewNumGoRoutinesThrottlerFailsShouldErr(t *testing.T) {
+	t.Parallel()
+
+	args := getArgumentsMeta()
+	args.NumConcurrentResolvingJobs = 0
+	rcf, err := resolverscontainer.NewMetaResolversContainerFactory(args)
+
+	assert.Nil(t, rcf)
+	assert.Equal(t, core.ErrNotPositiveValue, err)
+}
+
 func TestNewMetaResolversContainerFactory_NilShardCoordinatorShouldErr(t *testing.T) {
 	t.Parallel()
 
@@ -280,6 +292,18 @@ func TestMetaResolversContainerFactory_With4ShardsShouldWork(t *testing.T) {
 	assert.Equal(t, totalResolvers+noOfShards, container.Len())
 }
 
+func TestMetaResolversContainerFactory_IsInterfaceNil(t *testing.T) {
+	t.Parallel()
+
+	args := getArgumentsMeta()
+	args.ShardCoordinator = nil
+	rcf, _ := resolverscontainer.NewMetaResolversContainerFactory(args)
+	assert.True(t, rcf.IsInterfaceNil())
+
+	rcf, _ = resolverscontainer.NewMetaResolversContainerFactory(getArgumentsMeta())
+	assert.False(t, rcf.IsInterfaceNil())
+}
+
 func getArgumentsMeta() resolverscontainer.FactoryArgs {
 	return resolverscontainer.FactoryArgs{
 		ShardCoordinator:           mock.NewOneShardCoordinatorMock(),

dataRetriever/factory/resolverscontainer/shardResolversContainerFactory_test.go

@@ -5,6 +5,7 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/multiversx/mx-chain-core-go/core"
 	"github.com/multiversx/mx-chain-go/common"
 	"github.com/multiversx/mx-chain-go/dataRetriever"
 	"github.com/multiversx/mx-chain-go/dataRetriever/factory/resolverscontainer"
@@ -94,6 +95,17 @@ func createTriesHolderForShard() common.TriesHolder {
 
 // ------- NewResolversContainerFactory
 
+func TestNewShardResolversContainerFactory_NewNumGoRoutinesThrottlerFailsShouldErr(t *testing.T) {
+	t.Parallel()
+
+	args := getArgumentsShard()
+	args.NumConcurrentResolvingJobs = 0
+	rcf, err := resolverscontainer.NewShardResolversContainerFactory(args)
+
+	assert.Nil(t, rcf)
+	assert.Equal(t, core.ErrNotPositiveValue, err)
+}
+
 func TestNewShardResolversContainerFactory_NilShardCoordinatorShouldErr(t *testing.T) {
 	t.Parallel()
 
@@ -336,6 +348,18 @@ func TestShardResolversContainerFactory_With4ShardsShouldWork(t *testing.T) {
 	assert.Equal(t, totalResolvers, container.Len())
 }
 
+func TestShardResolversContainerFactory_IsInterfaceNil(t *testing.T) {
+	t.Parallel()
+
+	args := getArgumentsShard()
+	args.ShardCoordinator = nil
+	rcf, _ := resolverscontainer.NewShardResolversContainerFactory(args)
+	assert.True(t, rcf.IsInterfaceNil())
+
+	rcf, _ = resolverscontainer.NewShardResolversContainerFactory(getArgumentsMeta())
+	assert.False(t, rcf.IsInterfaceNil())
+}
+
 func getArgumentsShard() resolverscontainer.FactoryArgs {
 	return resolverscontainer.FactoryArgs{
 		ShardCoordinator:           mock.NewOneShardCoordinatorMock(),

dataRetriever/interface.go

@@ -316,7 +316,7 @@ type WhiteListHandler interface {
 	IsInterfaceNil() bool
 }
 
-// DebugHandler defines an interface for debugging the reqested-resolved data
+// DebugHandler defines an interface for debugging the requested-resolved data
 type DebugHandler interface {
 	LogRequestedData(topic string, hashes [][]byte, numReqIntra int, numReqCross int)
 	LogFailedToResolveData(topic string, hash []byte, err error)

dataRetriever/mock/marshalizerMock.go

@@ -32,7 +32,7 @@ func (mm *MarshalizerMock) Unmarshal(obj interface{}, buff []byte) error {
 	}
 
 	if obj == nil {
-		return errors.New("nil object to serilize to")
+		return errors.New("nil object to serialize to")
 	}
 
 	if buff == nil {

dataRetriever/provider/miniBlocks_test.go

@@ -2,6 +2,7 @@ package provider_test
 
 import (
 	"bytes"
+	"errors"
 	"fmt"
 	"testing"
 
@@ -240,13 +241,24 @@ func TestMiniBlockProvider_GetMiniBlocksFromStorerShouldBeFoundInStorage(t *test
 	existingHashes := [][]byte{
 		[]byte("hash1"),
 		[]byte("hash2"),
+		[]byte("hash3"),
 	}
 	requestedHashes := existingHashes
 
+	cnt := 0
 	arg := createMockMiniblockProviderArgs(nil, existingHashes)
+	arg.Marshalizer = &testscommon.MarshalizerStub{
+		UnmarshalCalled: func(obj interface{}, buff []byte) error {
+			cnt++
+			if cnt == 1 {
+				return errors.New("unmarshal fails for coverage")
+			}
+			return nil
+		},
+	}
 	mbp, _ := provider.NewMiniBlockProvider(arg)
 
 	miniBlocksAndHashes, missingHashes := mbp.GetMiniBlocksFromStorer(requestedHashes)
 	assert.Equal(t, 2, len(miniBlocksAndHashes))
-	assert.Equal(t, 0, len(missingHashes))
+	assert.Equal(t, 1, len(missingHashes))
 }