added check for fewer events than expected

Author: Stefan Effenberger

lib/web3.rs

@@ -1379,7 +1379,7 @@ pub fn get_eth_events(
     to_block: u64,
     topics: &Vec<B256>,
 ) -> Result<Vec<Log>, ValidationError> {
-    println!("Quering events from {} to {}", from_block, to_block);
+    println!("Querying events from {} to {}", from_block, to_block);
     let from_block_hex = format!("{:#x}", from_block);
     let to_block_hex = format!("{:#x}", to_block);
     let request_body = json!({

src/dvf.rs

@@ -221,8 +221,7 @@ fn validate_dvf(
 
             if num_occurrences + seen_events.len() > num_occurrences_expected {
                 return Err(ValidationError::Invalid(format!(
-                    "Found at least {} occurrences of event {}, but expected {}.",
-                    num_occurrences + seen_events.len(),
+                    "Found more occurrences of event {} than expected ({}).",
                     critical_event.sig,
                     num_occurrences_expected
                 )));
@@ -264,6 +263,14 @@ fn validate_dvf(
             current_from = current_to + 1;
         }
 
+        if num_occurrences < num_occurrences_expected {
+            return Err(ValidationError::Invalid(format!(
+                "Found less occurrences of event {} than expected ({}).",
+                critical_event.sig,
+                num_occurrences_expected
+            )));
+        }
+
         pb.inc(1);
     }
 
@@ -304,7 +311,7 @@ fn validate_dvf(
                             registry,
                             seen_ids,
                             allow_untrusted,
-                            false,
+                            continue_on_mismatch,
                             Some(reference.contract_name.clone()),
                         ));
                     }

tests/test_end_to_end.rs

@@ -1392,7 +1392,7 @@ mod tests {
                 let output = String::from_utf8_lossy(&dvf_assert.get_output().stdout);
                 println!("{}", &output);
 
-                assert!(output.contains("Deployment invalid: Found at least 3 occurrences of event Huh((uint256,address,bool,uint64[6],uint128)), but expected 2"), "The string does not contain the required text.");
+                assert!(output.contains("Deployment invalid: Found more occurrences of event Huh((uint256,address,bool,uint64[6],uint128)) than expected (2)."));
                 drop(local_client);
             }
         }