sanctuary fixes

- reset git state before running tests
- fix a bunch of nits with string/error reporting in CI
- trim null terminators from input files

crates/solidity/testing/sanctuary/src/datasets.rs

@@ -61,6 +61,12 @@ impl DataSet {
     }
 
     pub fn checkout_directory(&self, directory: &str) -> Result<&Vec<SourceFile>> {
+        Command::new("git")
+            .arg("reset")
+            .flag("--hard")
+            .current_dir(&self.repo_dir)
+            .run()?;
+
         let relative_path = format!("contracts/{network}/{directory}", network = self.network);
 
         Command::new("git")

crates/solidity/testing/sanctuary/src/events.rs

@@ -2,6 +2,7 @@ use std::cmp;
 
 use console::Color;
 use indicatif::ProgressBar;
+use infra_utils::github::GitHub;
 
 use crate::reporting::Reporter;
 
@@ -82,7 +83,10 @@ impl Events {
         self.all_directories.inc(1);
 
         self.reporter.hide();
-        self.reporter.print_full_report();
+
+        GitHub::collapse_group("Statistics:", || {
+            self.reporter.print_full_report();
+        });
     }
 
     pub fn test(&self, outcome: TestOutcome) {

crates/solidity/testing/sanctuary/src/reporting.rs

@@ -1,4 +1,3 @@
-use std::io::Write;
 use std::time::Duration;
 
 use console::{style, Color, Term};
@@ -67,9 +66,8 @@ impl Reporter {
 
         self.parent.set_draw_target(ProgressDrawTarget::hidden());
 
-        std::io::stdout()
-            .write_all(&buffer.contents_formatted()[..])
-            .unwrap();
+        let contents = String::from_utf8(buffer.contents_formatted()).unwrap();
+        println!("{contents}");
     }
 
     pub fn add_blank(&mut self) {

crates/solidity/testing/sanctuary/src/tests.rs

@@ -73,6 +73,8 @@ pub fn run_test(file: &SourceFile, events: &Events) -> Result<()> {
     let source = file
         .path
         .read_to_string()?
+        // Some files are null terminated, remove the null character:
+        .trim_end_matches('\0')
         // Remove unicode character inserted by sanctuary (illegal in Solidity):
         .replace("[email protected]", "[email-protected]");