Switch semantic to include/not-include vs. cache/not-cache

Signed-off-by: Peter Broadhurst <peter.broadhurst@kaleido.io>

Author: peterbroadhurst

pkg/ethblocklistener/blocklistener.go

@@ -43,7 +43,7 @@ type BlockListenerConfig struct {
 	BlockPollingInterval    time.Duration `json:"blockPollingInterval"`
 	HederaCompatibilityMode bool          `json:"hederaCompatibilityMode"`
 	BlockCacheSize          int           `json:"blockCacheSize"`
-	CacheLogsBloom          bool          `json:"cacheLogsBloom"`
+	IncludeLogsBloom        bool          `json:"includeLogsBloom"`
 }
 
 type BlockListener interface {

pkg/ethblocklistener/blocklistener_blockquery.go

@@ -31,9 +31,6 @@ import (
 )
 
 func (bl *blockListener) addToBlockCache(blockInfo *ethrpc.BlockInfoJSONRPC) {
-	if !bl.CacheLogsBloom {
-		blockInfo.LogsBloom = nil
-	}
 	bl.blockCache.Add(blockInfo.Hash.String(), blockInfo)
 	bl.blockCache.Add(blockInfo.Number.BigInt().String(), blockInfo)
 }
@@ -94,6 +91,9 @@ func (bl *blockListener) GetBlockInfoByNumber(ctx context.Context, blockNumber u
 		if blockInfo == nil {
 			return nil, nil
 		}
+		if !bl.IncludeLogsBloom {
+			blockInfo.LogsBloom = nil
+		}
 		bl.addToBlockCache(blockInfo)
 	}
 
@@ -116,6 +116,9 @@ func (bl *blockListener) GetBlockInfoByHash(ctx context.Context, hash0xString st
 			}
 			return nil, err
 		}
+		if !bl.IncludeLogsBloom {
+			blockInfo.LogsBloom = nil
+		}
 		bl.addToBlockCache(blockInfo)
 	}