Cosmetic filters flatbuffers

Author: atuchin-m

benches/bench_rules.rs

@@ -100,7 +100,7 @@ fn blocker_new(c: &mut Criterion) {
     .collect();
     let brave_list_rules: Vec<_> = rules_from_lists(&["data/brave/brave-main-list.txt"]).collect();
     let engine = Engine::from_rules(&brave_list_rules, Default::default());
-    let engine_serialized = engine.serialize().unwrap();
+    let engine_serialized = engine.serialize().to_vec();
 
     group.bench_function("el+ep", move |b| b.iter(|| get_engine(&easylist_rules)));
     group.bench_function("brave-list", move |b| {

benches/bench_serialization.rs

@@ -18,19 +18,19 @@ fn serialization(c: &mut Criterion) {
         ]);
 
         let engine = Engine::from_rules(full_rules, Default::default());
-        b.iter(|| assert!(!engine.serialize().unwrap().is_empty()))
+        b.iter(|| assert!(!engine.serialize().to_vec().is_empty()))
     });
     group.bench_function("el", move |b| {
         let full_rules = rules_from_lists(&["data/easylist.to/easylist/easylist.txt"]);
 
         let engine = Engine::from_rules(full_rules, Default::default());
-        b.iter(|| assert!(!engine.serialize().unwrap().is_empty()))
+        b.iter(|| assert!(!engine.serialize().to_vec().is_empty()))
     });
     group.bench_function("slimlist", move |b| {
         let full_rules = rules_from_lists(&["data/slim-list.txt"]);
 
         let engine = Engine::from_rules(full_rules, Default::default());
-        b.iter(|| assert!(!engine.serialize().unwrap().is_empty()))
+        b.iter(|| assert!(!engine.serialize().to_vec().is_empty()))
     });
 
     group.finish();
@@ -48,7 +48,7 @@ fn deserialization(c: &mut Criterion) {
         ]);
 
         let engine = Engine::from_rules(full_rules, Default::default());
-        let serialized = engine.serialize().unwrap();
+        let serialized = engine.serialize().to_vec();
 
         b.iter(|| {
             let mut deserialized = Engine::default();
@@ -59,7 +59,7 @@ fn deserialization(c: &mut Criterion) {
         let full_rules = rules_from_lists(&["data/easylist.to/easylist/easylist.txt"]);
 
         let engine = Engine::from_rules(full_rules, Default::default());
-        let serialized = engine.serialize().unwrap();
+        let serialized = engine.serialize().to_vec();
 
         b.iter(|| {
             let mut deserialized = Engine::default();
@@ -70,7 +70,7 @@ fn deserialization(c: &mut Criterion) {
         let full_rules = rules_from_lists(&["data/slim-list.txt"]);
 
         let engine = Engine::from_rules(full_rules, Default::default());
-        let serialized = engine.serialize().unwrap();
+        let serialized = engine.serialize().to_vec();
 
         b.iter(|| {
             let mut deserialized = Engine::default();

examples/generate-dat.rs

@@ -21,7 +21,7 @@ fn main() {
     )
     .unwrap();
     assert!(engine.check_network_request(&request).exception.is_some());
-    let serialized = engine.serialize().expect("Could not serialize!");
+    let serialized = engine.serialize().to_vec();
 
     // Write to file
     let mut file = File::create("engine.dat").expect("Could not create serialization file");

src/blocker.rs

@@ -440,11 +440,14 @@ impl Blocker {
         network_filters: Vec<crate::filters::network::NetworkFilter>,
         options: &BlockerOptions,
     ) -> Self {
-        use crate::filters::fb_builder::FlatBufferBuilder;
+        use crate::filters::fb_builder::make_flatbuffer_from_rules;
         use crate::filters::fb_network::FilterDataContext;
 
-        let memory =
-            FlatBufferBuilder::make_flatbuffer(network_filters, options.enable_optimizations);
+        let memory = make_flatbuffer_from_rules(
+            network_filters,
+            vec![], // no cosmetic filters for blocker test
+            options.enable_optimizations,
+        );
         let filter_data_context = FilterDataContext::new(memory);
         Self::from_context(filter_data_context)
     }