Bloomchain

ethcore/src/blockchain/cache.rs

@@ -23,8 +23,6 @@ pub struct CacheSize {
 	pub block_details: usize,
 	/// Transaction addresses cache size.
 	pub transaction_addresses: usize,
-	/// Logs cache size.
-	pub block_logs: usize,
 	/// Blooms cache size.
 	pub blocks_blooms: usize,
 	/// Block receipts size.
@@ -33,5 +31,7 @@ pub struct CacheSize {
 
 impl CacheSize {
 	/// Total amount used by the cache.
-	pub fn total(&self) -> usize { self.blocks + self.block_details + self.transaction_addresses + self.block_logs + self.blocks_blooms }
+	pub fn total(&self) -> usize {
+		self.blocks + self.block_details + self.transaction_addresses + self.blocks_blooms + self.block_receipts
+	}
 }

ethcore/src/chainfilter/mod.rs → ethcore/src/blockchain/config.rs

@@ -14,22 +14,23 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-//! Multilevel blockchain bloom filter.
-
-mod bloomindex;
-mod chainfilter;
-mod indexer;
-
-#[cfg(test)]
-mod tests;
-
-pub use self::bloomindex::BloomIndex;
-pub use self::chainfilter::ChainFilter;
-use util::hash::H2048;
+//! Blockchain configuration.
+
+/// Blockchain configuration.
+#[derive(Debug)]
+pub struct Config {
+	/// Preferred cache size in bytes.
+	pub pref_cache_size: usize,
+	/// Maximum cache size in bytes.
+	pub max_cache_size: usize,
+}
 
-/// Types implementing this trait provide read access for bloom filters database.
-pub trait FilterDataSource {
-	/// returns reference to log at given position if it exists
-	fn bloom_at_index(&self, index: &BloomIndex) -> Option<H2048>;
+impl Default for Config {
+	fn default() -> Self {
+		Config {
+			pref_cache_size: 1 << 14,
+			max_cache_size: 1 << 20,
+		}
+	}
 }