Merge pull request #2409 from demergent-labs/stable_structures_no_arr…

…ay_access remove direct array accesses in experimental stable structures
demergent-labs · Dec 31, 2024 · b046c7a · b046c7a
2 parents f9b9249 + ef29773
commit b046c7a
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 7 deletions.
diff --git a/canister_templates/experimental.wasm b/canister_templates/experimental.wasm
diff --git a/canister_templates/stable.wasm b/canister_templates/stable.wasm
diff --git a/.../wasm_binary/rust/experimental_canister_template/src/ic/stable_b_tree_map_contains_key.rs b/.../wasm_binary/rust/experimental_canister_template/src/ic/stable_b_tree_map_contains_key.rs
@@ -22,7 +22,10 @@ impl JsFn for NativeFunction {
             .with(|stable_b_tree_maps| {
                 let stable_b_tree_maps = stable_b_tree_maps.borrow();
 
-                stable_b_tree_maps[&memory_id].contains_key(&AzleStableBTreeMapKey { bytes: key })
+                stable_b_tree_maps
+                    .get(&memory_id)
+                    .unwrap()
+                    .contains_key(&AzleStableBTreeMapKey { bytes: key })
             })
             .into()
     }

diff --git a/...s/compile/wasm_binary/rust/experimental_canister_template/src/ic/stable_b_tree_map_get.rs b/...s/compile/wasm_binary/rust/experimental_canister_template/src/ic/stable_b_tree_map_get.rs
@@ -21,7 +21,10 @@ impl JsFn for NativeFunction {
         let value_option = STABLE_B_TREE_MAPS.with(|stable_b_tree_maps| {
             let stable_b_tree_maps = stable_b_tree_maps.borrow();
 
-            stable_b_tree_maps[&memory_id].get(&AzleStableBTreeMapKey { bytes: key })
+            stable_b_tree_maps
+                .get(&memory_id)
+                .unwrap()
+                .get(&AzleStableBTreeMapKey { bytes: key })
         });
 
         // TODO could we somehow encode the entire option here more easily

diff --git a/...pile/wasm_binary/rust/experimental_canister_template/src/ic/stable_b_tree_map_is_empty.rs b/...pile/wasm_binary/rust/experimental_canister_template/src/ic/stable_b_tree_map_is_empty.rs
@@ -16,7 +16,7 @@ impl JsFn for NativeFunction {
             .with(|stable_b_tree_maps| {
                 let stable_b_tree_maps = stable_b_tree_maps.borrow();
 
-                stable_b_tree_maps[&memory_id].is_empty()
+                stable_b_tree_maps.get(&memory_id).unwrap().is_empty()
             })
             .into()
     }

diff --git a/...compile/wasm_binary/rust/experimental_canister_template/src/ic/stable_b_tree_map_items.rs b/...compile/wasm_binary/rust/experimental_canister_template/src/ic/stable_b_tree_map_items.rs
@@ -29,7 +29,7 @@ impl JsFn for NativeFunction {
 
         let items: Vec<Vec<Vec<u8>>> = STABLE_B_TREE_MAPS.with(|stable_b_tree_maps| {
             let stable_b_tree_maps = stable_b_tree_maps.borrow();
-            let stable_b_tree_map = &stable_b_tree_maps[&memory_id];
+            let stable_b_tree_map = stable_b_tree_maps.get(&memory_id).unwrap();
 
             stable_b_tree_map
                 .iter()

diff --git a/.../compile/wasm_binary/rust/experimental_canister_template/src/ic/stable_b_tree_map_keys.rs b/.../compile/wasm_binary/rust/experimental_canister_template/src/ic/stable_b_tree_map_keys.rs
@@ -29,7 +29,7 @@ impl JsFn for NativeFunction {
 
         let keys: Vec<Vec<u8>> = STABLE_B_TREE_MAPS.with(|stable_b_tree_maps| {
             let stable_b_tree_maps = stable_b_tree_maps.borrow();
-            let stable_b_tree_map = &stable_b_tree_maps[&memory_id];
+            let stable_b_tree_map = stable_b_tree_maps.get(&memory_id).unwrap();
 
             stable_b_tree_map
                 .iter()

diff --git a/...s/compile/wasm_binary/rust/experimental_canister_template/src/ic/stable_b_tree_map_len.rs b/...s/compile/wasm_binary/rust/experimental_canister_template/src/ic/stable_b_tree_map_len.rs
@@ -15,7 +15,7 @@ impl JsFn for NativeFunction {
         let len = STABLE_B_TREE_MAPS.with(|stable_b_tree_maps| {
             let stable_b_tree_maps = stable_b_tree_maps.borrow();
 
-            stable_b_tree_maps[&memory_id].len()
+            stable_b_tree_maps.get(&memory_id).unwrap().len()
         });
 
         context.new_string(&len.to_string()).into()

diff --git a/...ompile/wasm_binary/rust/experimental_canister_template/src/ic/stable_b_tree_map_values.rs b/...ompile/wasm_binary/rust/experimental_canister_template/src/ic/stable_b_tree_map_values.rs
@@ -29,7 +29,7 @@ impl JsFn for NativeFunction {
 
         let values: Vec<Vec<u8>> = STABLE_B_TREE_MAPS.with(|stable_b_tree_maps| {
             let stable_b_tree_maps = stable_b_tree_maps.borrow();
-            let stable_b_tree_map = &stable_b_tree_maps[&memory_id];
+            let stable_b_tree_map = stable_b_tree_maps.get(&memory_id).unwrap();
 
             stable_b_tree_map
                 .iter()