Expose logsToBloom

Author: taylanpince

cmd/ethkit/block.go

@@ -323,19 +323,8 @@ func CheckLogs(block *types.Block, provider *ethrpc.Provider, ignoreZeroGasLogs
 	fmt.Printf("Logs Count: %d\n", len(filteredLogs))
 	fmt.Printf("Match: %v\n", ethutil.ValidateLogsWithBlockHeader(filteredLogs, h, optCheck...))
 	fmt.Println()
-	fmt.Printf("Calculated Log Bloom: 0x%x\n", logsToBloom(filteredLogs).Bytes())
+	fmt.Printf("Calculated Log Bloom: 0x%x\n", ethutil.ConvertLogsToBloom(filteredLogs).Bytes())
 	fmt.Println()
 	fmt.Printf("Header Log Bloom: 0x%x\n", h.Bloom.Bytes())
 	fmt.Println()
 }
-
-func logsToBloom(logs []types.Log) types.Bloom {
-	var logBloom types.Bloom
-	for _, log := range logs {
-		logBloom.Add(log.Address.Bytes())
-		for _, b := range log.Topics {
-			logBloom.Add(b[:])
-		}
-	}
-	return logBloom
-}

ethutil/validate_logs_with_block.go

@@ -19,10 +19,10 @@ func ValidateLogsWithBlockHeader(logs []types.Log, header *types.Header, optLogs
 		return optLogsBloomCheck[0](logs, header)
 	}
 
-	return bytes.Equal(logsToBloom(logs).Bytes(), header.Bloom.Bytes())
+	return bytes.Equal(ConvertLogsToBloom(logs).Bytes(), header.Bloom.Bytes())
 }
 
-func logsToBloom(logs []types.Log) types.Bloom {
+func ConvertLogsToBloom(logs []types.Log) types.Bloom {
 	var logBloom types.Bloom
 	for _, log := range logs {
 		logBloom.Add(log.Address.Bytes())

ethutil/validate_logs_with_block_test.go

@@ -42,16 +42,16 @@ func TestValidateLogsWithBlockHeaderWithCustomCheck(t *testing.T) {
 		},
 	}
 
-	headerFull := &types.Header{Bloom: logsToBloom(logs)}
-	headerFiltered := &types.Header{Bloom: logsToBloom(logs[1:])}
+	headerFull := &types.Header{Bloom: ConvertLogsToBloom(logs)}
+	headerFiltered := &types.Header{Bloom: ConvertLogsToBloom(logs[1:])}
 
 	require.True(t, ValidateLogsWithBlockHeader(logs, headerFull))
 	require.False(t, ValidateLogsWithBlockHeader(logs, headerFiltered))
 
 	customCheck := func(ls []types.Log, header *types.Header) bool {
 		// Ignore the first log (e.g., system tx) and validate bloom against the remainder.
 		filtered := ls[1:]
-		return bytes.Equal(logsToBloom(filtered).Bytes(), header.Bloom.Bytes())
+		return bytes.Equal(ConvertLogsToBloom(filtered).Bytes(), header.Bloom.Bytes())
 	}
 
 	require.True(t, ValidateLogsWithBlockHeader(logs, headerFiltered, customCheck))