Merge branch 'main' into test/404

Author: peterpeterparker

.github/workflows/tests-screenshots.yml

@@ -92,6 +92,6 @@ jobs:
         uses: EndBug/add-and-commit@v9
         if: ${{ github.ref != 'refs/heads/main' }}
         with:
-          add: e2e
+          add: ./src/e2e
           default_author: github_actions
           message: "🤖 update E2E screenshots"

src/libs/storage/src/certification/impls.rs

@@ -64,7 +64,7 @@ impl CertifiedAssetHashes {
         let combined_proof = fallback_paths
             .into_iter()
             .fold(absence_proof, |accumulator, path| {
-                let new_proof = self.tree_v2.witness(&[path]);
+                let new_proof = self.tree_v2.witness(&path);
                 merge_hash_trees(accumulator, new_proof)
             });
 

src/libs/storage/src/certification/tree_utils.rs

@@ -1,6 +1,6 @@
 use crate::certification::constants::{
-    EXACT_MATCH_TERMINATOR, IC_CERTIFICATE_EXPRESSION, IC_CERTIFICATE_EXPRESSION_HEADER,
-    IC_STATUS_CODE_PSEUDO_HEADER, LABEL_HTTP_EXPR, WILDCARD_MATCH_TERMINATOR,
+    IC_CERTIFICATE_EXPRESSION, IC_CERTIFICATE_EXPRESSION_HEADER, IC_STATUS_CODE_PSEUDO_HEADER,
+    LABEL_HTTP_EXPR, WILDCARD_MATCH_TERMINATOR,
 };
 use crate::http::types::{HeaderField, StatusCode};
 use crate::types::state::FullPath;
@@ -41,19 +41,18 @@ pub fn nested_tree_path(full_path: &str, terminator: &str) -> Vec<Blob> {
     segments
 }
 
-pub fn fallback_paths(paths: Vec<Blob>) -> Vec<Blob> {
+pub fn fallback_paths(paths: Vec<Blob>) -> Vec<Vec<Blob>> {
     let mut fallback_paths = Vec::new();
 
-    // starting at 1 because "http_expr" is always the starting element
-    for i in 1..paths.len() {
+    for i in 0..paths.len() {
         let mut without_trailing_slash: Vec<Blob> = paths.as_slice()[0..i].to_vec();
         let mut with_trailing_slash = without_trailing_slash.clone();
-        without_trailing_slash.push(EXACT_MATCH_TERMINATOR.as_bytes().to_vec());
+        without_trailing_slash.push(WILDCARD_MATCH_TERMINATOR.as_bytes().to_vec());
         with_trailing_slash.push("".as_bytes().to_vec());
         with_trailing_slash.push(WILDCARD_MATCH_TERMINATOR.as_bytes().to_vec());
 
-        fallback_paths.extend(without_trailing_slash);
-        fallback_paths.extend(with_trailing_slash);
+        fallback_paths.push(without_trailing_slash);
+        fallback_paths.push(with_trailing_slash);
     }
 
     fallback_paths