feat: replace ic-certified-map with ic-certification (#315)

junobuild · Nov 17, 2023 · fb1b1eb · fb1b1eb
1 parent 615dcaa
commit fb1b1eb
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 235 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/satellite/Cargo.toml b/src/satellite/Cargo.toml
@@ -16,7 +16,7 @@ serde = "1.0.190"
 serde_bytes = "0.11.12"
 serde_cbor = "0.11.2"
 regex = "1.9.3"
-ic-certified-map = "0.4.0"
+ic-certification = "1.3.0"
 sha2 = "0.10.7"
 base64 = "0.13.1"
 url = "2.4.0"

diff --git a/src/satellite/src/storage/certification/impls.rs b/src/satellite/src/storage/certification/impls.rs
@@ -1,7 +1,6 @@
 use crate::storage::certification::constants::{
     EXACT_MATCH_TERMINATOR, LABEL_ASSETS_V1, LABEL_ASSETS_V2, WILDCARD_MATCH_TERMINATOR,
 };
-use crate::storage::certification::tree::merge_hash_trees;
 use crate::storage::certification::tree_utils::{
     fallback_paths, nested_tree_expr_path, nested_tree_key, nested_tree_path,
 };
@@ -16,7 +15,7 @@ use crate::storage::types::config::StorageConfig;
 use crate::storage::types::state::FullPath;
 use crate::storage::types::store::Asset;
 use crate::storage::url::alternative_paths;
-use ic_certified_map::{fork, fork_hash, labeled, labeled_hash, AsHashTree, Hash, HashTree};
+use ic_certification::{fork, fork_hash, labeled, labeled_hash, merge_hash_trees, AsHashTree, Hash, HashTree, pruned};
 use sha2::{Digest, Sha256};
 
 impl CertifiedAssetHashes {
@@ -33,7 +32,7 @@ impl CertifiedAssetHashes {
         let witness = self.tree_v1.witness(path.as_bytes());
         fork(
             labeled(LABEL_ASSETS_V1, witness),
-            HashTree::Pruned(labeled_hash(LABEL_ASSETS_V2, &self.tree_v2.root_hash())),
+            pruned(labeled_hash(LABEL_ASSETS_V2, &self.tree_v2.root_hash())),
         )
     }
 
@@ -44,7 +43,7 @@ impl CertifiedAssetHashes {
         let witness = self.tree_v2.witness(&segments);
 
         fork(
-            HashTree::Pruned(labeled_hash(LABEL_ASSETS_V1, &self.tree_v1.root_hash())),
+            pruned(labeled_hash(LABEL_ASSETS_V1, &self.tree_v1.root_hash())),
             labeled(LABEL_ASSETS_V2, witness),
         )
     }
@@ -68,7 +67,7 @@ impl CertifiedAssetHashes {
             });
 
         fork(
-            HashTree::Pruned(labeled_hash(LABEL_ASSETS_V1, &self.tree_v1.root_hash())),
+            pruned(labeled_hash(LABEL_ASSETS_V1, &self.tree_v1.root_hash())),
             labeled(LABEL_ASSETS_V2, combined_proof),
         )
     }

diff --git a/src/satellite/src/storage/certification/mod.rs b/src/satellite/src/storage/certification/mod.rs
@@ -1,6 +1,5 @@
 pub mod cert;
 mod constants;
 mod impls;
-mod tree;
 mod tree_utils;
 pub mod types;
diff --git a/src/satellite/src/storage/certification/tree.rs b/src/satellite/src/storage/certification/tree.rs
diff --git a/src/satellite/src/storage/certification/tree_utils.rs b/src/satellite/src/storage/certification/tree_utils.rs
@@ -5,7 +5,7 @@ use crate::storage::certification::constants::{
 use crate::storage::http::types::{HeaderField, StatusCode};
 use crate::storage::types::state::FullPath;
 use crate::types::core::Blob;
-use ic_certified_map::Hash;
+use ic_certification::Hash;
 use ic_representation_independent_hash::{representation_independent_hash, Value};
 use sha2::{Digest, Sha256};
 

diff --git a/src/satellite/src/storage/certification/types.rs b/src/satellite/src/storage/certification/types.rs
@@ -1,7 +1,6 @@
 pub mod certified {
-    use crate::storage::certification::tree::NestedTree;
     use crate::types::core::Blob;
-    use ic_certified_map::{Hash, RbTree};
+    use ic_certification::{Hash, NestedTree, RbTree};
     use std::clone::Clone;
 
     #[derive(Default, Clone)]

diff --git a/src/satellite/src/storage/types.rs b/src/satellite/src/storage/types.rs
@@ -55,7 +55,7 @@ pub mod store {
     use crate::storage::types::state::FullPath;
     use crate::types::core::{Blob, CollectionKey};
     use candid::CandidType;
-    use ic_certified_map::Hash;
+    use ic_certification::Hash;
     use serde::{Deserialize, Serialize};
     use shared::types::state::UserId;
     use std::clone::Clone;
@@ -116,7 +116,7 @@ pub mod store {
 
 pub mod interface {
     use candid::{CandidType, Deserialize};
-    use ic_certified_map::Hash;
+    use ic_certification::Hash;
 
     use crate::storage::http::types::HeaderField;
     use crate::storage::types::state::FullPath;