Merge branch 'rc/v1.4.0' into userAccountHandler-interface-change

data/block/block_test.go

@@ -835,3 +835,13 @@ func TestHeader_HasScheduledMiniBlocks(t *testing.T) {
 	h.MiniBlockHeaders = []block.MiniBlockHeader{*mbHeader}
 	require.False(t, h.HasScheduledMiniBlocks())
 }
+
+func TestMiniBlockHeader_GetMiniBlockHeaderReservedShouldErrWhenReservedFieldIsNil(t *testing.T) {
+	t.Parallel()
+
+	mbh := &block.MiniBlockHeader{}
+
+	mbhr, err := mbh.GetMiniBlockHeaderReserved()
+	assert.Nil(t, mbhr)
+	assert.Equal(t, data.ErrNilReservedField, err)
+}

data/block/miniBlockHeader.go

@@ -145,7 +145,7 @@ func (m *MiniBlockHeader) getMiniBlockHeaderReserved() (*MiniBlockHeaderReserved
 
 		return mbhr, nil
 	}
-	return nil, nil
+	return nil, data.ErrNilReservedField
 }
 
 // SetMiniBlockHeaderReserved sets the Reserved field for the miniBlock header with the given parameter

data/errors.go

@@ -78,3 +78,6 @@ var ErrScheduledRootHashNotSupported = errors.New("scheduled root hash is not su
 
 // ErrWrongTransactionsTypeSize signals that size of transactions type buffer from mini block reserved field is wrong
 var ErrWrongTransactionsTypeSize = errors.New("wrong transactions type size")
+
+// ErrNilReservedField signals that a nil reserved field was provided
+var ErrNilReservedField = errors.New("reserved field is nil")