remove assertBatchIdsEquals (#161)

Signed-off-by: Hagar Meir <hagar.meir@ibm.com>

Author: HagarMeir

node/assembler/batch_cache_test.go

@@ -114,7 +114,7 @@ func TestBatchCache_Pop(t *testing.T) {
 		for _, batch := range batches {
 			poppedBatch, err := cache.Pop(batch)
 			require.NoError(t, err)
-			assertBatchIdsEquals(t, batch, poppedBatch)
+			require.True(t, types.BatchIDEqual(batch, poppedBatch))
 		}
 	})
 
@@ -145,8 +145,8 @@ func TestBatchCache_Pop(t *testing.T) {
 		// Assert
 		require.NoError(t, err1)
 		require.NoError(t, err2)
-		assertBatchIdsEquals(t, batch, poppedBatch)
-		assertBatchIdsEquals(t, batchDifferentDigest, poppedBatchDifferentDigest)
+		require.True(t, types.BatchIDEqual(batch, poppedBatch))
+		require.True(t, types.BatchIDEqual(batchDifferentDigest, poppedBatchDifferentDigest))
 	})
 }
 
@@ -165,7 +165,7 @@ func TestBatchCache_Put(t *testing.T) {
 		// Assert
 
 		require.NoError(t, err)
-		assertBatchIdsEquals(t, batch, poppedBatch)
+		require.True(t, types.BatchIDEqual(batch, poppedBatch))
 	})
 
 	t.Run("MultiplePutsOnSameBatchWillRaiseAnError", func(t *testing.T) {

node/assembler/batch_heap_test.go

@@ -15,7 +15,7 @@ import (
 )
 
 func assertSameHeapItems[T any](t *testing.T, expected, actual *assembler.BatchHeapItem[T]) {
-	assertBatchIdsEquals(t, expected.Batch, actual.Batch)
+	require.True(t, types.BatchIDEqual(expected.Batch, actual.Batch))
 	require.Equal(t, expected.Value, actual.Value)
 }
 

node/assembler/partition_prefetch_index_test.go

@@ -124,7 +124,7 @@ func putCommonTests(t *testing.T, put func(*assembler.PartitionPrefetchIndex, ty
 		require.NoError(t, err)
 
 		// Assert
-		assertBatchIdsEquals(t, batch, poped_batch)
+		require.True(t, types.BatchIDEqual(batch, poped_batch))
 	})
 
 	t.Run("PuttingBatchTooLargeWillResultInError", func(t *testing.T) {
@@ -184,7 +184,7 @@ func TestPartitionPrefetchIndex_PopOrWait(t *testing.T) {
 
 		// Assert
 		require.NoError(t, err)
-		assertBatchIdsEquals(t, batch, poppedBatch)
+		require.True(t, types.BatchIDEqual(batch, poppedBatch))
 	})
 
 	t.Run("PopWillStopBatchTtlTimer", func(t *testing.T) {
@@ -236,7 +236,7 @@ func TestPartitionPrefetchIndex_PopOrWait(t *testing.T) {
 		batchRequest := <-test.batchRequestChan
 
 		// Assert
-		assertBatchIdsEquals(t, batchRequest, popBatchId)
+		require.True(t, types.BatchIDEqual(batchRequest, popBatchId))
 	})
 
 	t.Run("PopBeforePutShouldNotRaiseRequestIfSeqGreaterThanLastPut", func(t *testing.T) {
@@ -290,7 +290,7 @@ func TestPartitionPrefetchIndex_PopOrWait(t *testing.T) {
 		// Assert
 		time.Sleep(eventuallyTick)
 		batch := <-popedBatchChan
-		assertBatchIdsEquals(t, batches[9], batch)
+		require.True(t, types.BatchIDEqual(batches[9], batch))
 		require.True(t, test.batchCache.Has(batches[7]))
 		require.True(t, test.batchCache.Has(batches[8]))
 		require.Equal(t, 2, test.batchCache.SizeBytes())
@@ -312,7 +312,7 @@ func TestPartitionPrefetchIndex_PopOrWait(t *testing.T) {
 		// Assert
 		time.Sleep(eventuallyTick)
 		reqeustedBatchId := <-test.batchRequestChan
-		assertBatchIdsEquals(t, batch2, reqeustedBatchId)
+		require.True(t, types.BatchIDEqual(batch2, reqeustedBatchId))
 	})
 }
 
@@ -510,7 +510,7 @@ func TestPartitionPrefetchIndex_PutForce(t *testing.T) {
 
 		// Assert
 		require.NoError(t, err)
-		assertBatchIdsEquals(t, batch, poppedBatch)
+		require.True(t, types.BatchIDEqual(batch, poppedBatch))
 		require.False(t, test.forcePutCache.Has(batch))
 	})
 
@@ -543,7 +543,7 @@ func TestPartitionPrefetchIndex_PutForce(t *testing.T) {
 			defer wg.Done()
 			poppedBatch, err := test.partitionPrefetchIndex.PopOrWait(batches[3])
 			require.NoError(t, err)
-			assertBatchIdsEquals(t, batches[3], poppedBatch)
+			require.True(t, types.BatchIDEqual(batches[3], poppedBatch))
 		}()
 
 		// Act

node/assembler/prefetch_index_test.go

@@ -108,7 +108,7 @@ func TestPrefetchIndex_Requests(t *testing.T) {
 
 		// Assert
 		requestedBatch := test.prefetchIndex.Requests()
-		assertBatchIdsEquals(t, batch, <-requestedBatch)
+		require.True(t, types.BatchIDEqual(batch, <-requestedBatch))
 	})
 }
 
@@ -137,9 +137,9 @@ func checkCorrectPartitionIndexerCalledWithCorrectBatchId(
 
 		// Assert
 		require.Equal(t, 1, callsCount(batch1PartitionIndexer))
-		assertBatchIdsEquals(t, batch1, batchPerCall(batch1PartitionIndexer, 0))
+		require.True(t, types.BatchIDEqual(batch1, batchPerCall(batch1PartitionIndexer, 0)))
 		require.Equal(t, 1, callsCount(batch2PartitionIndexer))
-		assertBatchIdsEquals(t, batch2, batchPerCall(batch2PartitionIndexer, 0))
+		require.True(t, types.BatchIDEqual(batch2, batchPerCall(batch2PartitionIndexer, 0)))
 	})
 }
 
@@ -168,7 +168,7 @@ func TestPrefetchIndex_PopOrWait(t *testing.T) {
 
 		// Assert
 		require.NoError(t, err)
-		assertBatchIdsEquals(t, batch, popedBatch)
+		require.True(t, types.BatchIDEqual(batch, popedBatch))
 	})
 
 	t.Run("CheckErrRaisedFromPartitionIndexer", func(t *testing.T) {

node/assembler/prefetcher_test.go

@@ -86,7 +86,7 @@ func TestPrefetcher_BatchesReceivedByReplicationAreBeingIndexed(t *testing.T) {
 	}, eventuallyTimeout, eventuallyTick)
 	for i := 0; i < test.prefetchIndexMock.PutCallCount(); i++ {
 		batch := test.prefetchIndexMock.PutArgsForCall(0)
-		assertBatchIdsEquals(t, batch, shardToBatch[batch.Shard()])
+		require.True(t, types.BatchIDEqual(batch, shardToBatch[batch.Shard()]))
 	}
 }
 
@@ -127,9 +127,9 @@ func TestPrefetcher_RequestedBatchWillBeFetchedByFetcherAndForcePutToIndex(t *te
 		return test.batchFetcherMock.GetBatchCallCount() == 1 && test.prefetchIndexMock.PutForceCallCount() == 1
 	}, eventuallyTimeout, eventuallyTick)
 	requestedBatchId := test.batchFetcherMock.GetBatchArgsForCall(0)
-	assertBatchIdsEquals(t, batch, requestedBatchId)
+	require.True(t, types.BatchIDEqual(batch, requestedBatchId))
 	putBatch := test.prefetchIndexMock.PutForceArgsForCall(0)
-	assertBatchIdsEquals(t, batch, putBatch)
+	require.True(t, types.BatchIDEqual(batch, putBatch))
 }
 
 func TestPrefetcher_StopWillStopBatchFetcher(t *testing.T) {

node/assembler/utils_test.go

@@ -7,10 +7,7 @@ SPDX-License-Identifier: Apache-2.0
 package assembler_test
 
 import (
-	"testing"
-
 	"github.com/hyperledger/fabric-x-orderer/common/types"
-	"github.com/stretchr/testify/require"
 )
 
 func createTestBatch(shard types.ShardID, primary types.PartyID, seq types.BatchSequence, req []byte) types.Batch {
@@ -39,7 +36,3 @@ func createTestBatchWithSize(shard types.ShardID, primary types.PartyID, seq typ
 func createTestBatchId(shard types.ShardID, primary types.PartyID, seq types.BatchSequence, req []byte) types.BatchID {
 	return types.NewSimpleBatch(seq, shard, primary, types.BatchedRequests{req})
 }
-
-func assertBatchIdsEquals(t *testing.T, expectedBatchId, actualBatchId types.BatchID) {
-	require.True(t, types.BatchIDEqual(expectedBatchId, actualBatchId))
-}