Merge pull request #2363 from demergent-labs/stable_b_tree_map_class

make stable b tree map a class
demergent-labs · Dec 20, 2024 · c43a7f4 · c43a7f4
2 parents 6a76d8b + 20ec112
commit c43a7f4
Show file tree

Hide file tree

Showing 19 changed files with 343 additions and 338 deletions.
diff --git a/examples/stable/test/end_to_end/candid_rpc/audio_recorder/src/index.ts b/examples/stable/test/end_to_end/candid_rpc/audio_recorder/src/index.ts
@@ -29,8 +29,8 @@ type Recording = {
 };
 
 export default class {
-    users = StableBTreeMap<Principal, User>(0);
-    recordings = StableBTreeMap<Principal, Recording>(1);
+    users = new StableBTreeMap<Principal, User>(0);
+    recordings = new StableBTreeMap<Principal, Recording>(1);
 
     @update([IDL.Text], User)
     createUser(username: string): User {

diff --git a/examples/stable/test/end_to_end/candid_rpc/ethereum_json_rpc/src/index.ts b/examples/stable/test/end_to_end/candid_rpc/ethereum_json_rpc/src/index.ts
@@ -15,7 +15,7 @@ import {
 } from 'azle/canisters/management';
 
 export default class {
-    stableStorage = StableBTreeMap<string, string>(0);
+    stableStorage = new StableBTreeMap<string, string>(0);
 
     @init([IDL.Text])
     init(ethereumUrl: string): void {

diff --git a/examples/stable/test/end_to_end/candid_rpc/func_types/canisters/func_types/index.ts b/examples/stable/test/end_to_end/candid_rpc/func_types/canisters/func_types/index.ts
@@ -56,7 +56,7 @@ const NullFunc = IDL.Func(
 type NullFunc = Func;
 
 export default class {
-    stableStorage = StableBTreeMap<string, StableFunc>(0);
+    stableStorage = new StableBTreeMap<string, StableFunc>(0);
 
     @init([])
     init(): void {

diff --git a/examples/stable/test/end_to_end/candid_rpc/motoko_examples/http_counter/src/index.ts b/examples/stable/test/end_to_end/candid_rpc/motoko_examples/http_counter/src/index.ts
@@ -98,7 +98,7 @@ export type HttpResponse = {
 };
 
 export default class {
-    stableStorage = StableBTreeMap<string, bigint>(0);
+    stableStorage = new StableBTreeMap<string, bigint>(0);
 
     @init([])
     init(): void {

diff --git a/examples/stable/test/end_to_end/candid_rpc/motoko_examples/persistent-storage/src/index.ts b/examples/stable/test/end_to_end/candid_rpc/motoko_examples/persistent-storage/src/index.ts
@@ -9,7 +9,7 @@ import {
 } from 'azle';
 
 export default class {
-    stableStorage = StableBTreeMap<string, bigint>(0);
+    stableStorage = new StableBTreeMap<string, bigint>(0);
     redeployed = false;
 
     @init([])

diff --git a/examples/stable/test/end_to_end/candid_rpc/pre_and_post_upgrade/src/index.ts b/examples/stable/test/end_to_end/candid_rpc/pre_and_post_upgrade/src/index.ts
@@ -18,7 +18,7 @@ type Entry = {
 };
 
 export default class {
-    stableStorage = StableBTreeMap<string, Entry[]>(0);
+    stableStorage = new StableBTreeMap<string, Entry[]>(0);
 
     entries: {
         [key: string]: bigint;

diff --git a/...able/test/end_to_end/candid_rpc/stable_b_tree_map_instruction_threshold/package-lock.json b/...able/test/end_to_end/candid_rpc/stable_b_tree_map_instruction_threshold/package-lock.json
diff --git a/...es/stable/test/end_to_end/candid_rpc/stable_b_tree_map_instruction_threshold/src/index.ts b/...es/stable/test/end_to_end/candid_rpc/stable_b_tree_map_instruction_threshold/src/index.ts
@@ -41,9 +41,9 @@ type LargeRecord = {
 };
 
 export default class {
-    smallRecordMap = StableBTreeMap<string, SmallRecord>(0);
-    mediumRecordMap = StableBTreeMap<string, MediumRecord>(1);
-    largeRecordMap = StableBTreeMap<string, LargeRecord>(2);
+    smallRecordMap = new StableBTreeMap<string, SmallRecord>(0);
+    mediumRecordMap = new StableBTreeMap<string, MediumRecord>(1);
+    largeRecordMap = new StableBTreeMap<string, LargeRecord>(2);
 
     @update([IDL.Nat32])
     insertSmallRecord(numToInsert: number): void {

diff --git a/examples/stable/test/end_to_end/candid_rpc/stable_structures/package-lock.json b/examples/stable/test/end_to_end/candid_rpc/stable_structures/package-lock.json
diff --git a/examples/stable/test/end_to_end/candid_rpc/stable_structures/src/canister1/index.ts b/examples/stable/test/end_to_end/candid_rpc/stable_structures/src/canister1/index.ts
@@ -3,11 +3,11 @@ import { IDL, query, StableBTreeMap, update } from 'azle';
 import { Reaction, User } from '../types';
 
 export default class {
-    stableMap0 = StableBTreeMap<number, string>(0);
-    stableMap1 = StableBTreeMap<number, Uint8Array>(1);
-    stableMap2 = StableBTreeMap<number, bigint>(2);
-    stableMap3 = StableBTreeMap<Reaction, bigint>(3);
-    stableMap4 = StableBTreeMap<User, number>(4);
+    stableMap0 = new StableBTreeMap<number, string>(0);
+    stableMap1 = new StableBTreeMap<number, Uint8Array>(1);
+    stableMap2 = new StableBTreeMap<number, bigint>(2);
+    stableMap3 = new StableBTreeMap<Reaction, bigint>(3);
+    stableMap4 = new StableBTreeMap<User, number>(4);
 
     @query([], IDL.Bool)
     getRedeployed(): boolean {

diff --git a/examples/stable/test/end_to_end/candid_rpc/stable_structures/src/canister2/index.ts b/examples/stable/test/end_to_end/candid_rpc/stable_structures/src/canister2/index.ts
@@ -1,11 +1,11 @@
 import { IDL, query, StableBTreeMap, update } from 'azle';
 
 export default class {
-    stableMap5 = StableBTreeMap<[string] | [], number>(5);
-    stableMap6 = StableBTreeMap<bigint[], boolean>(6);
-    stableMap7 = StableBTreeMap<null, null>(7);
-    stableMap8 = StableBTreeMap<boolean, null>(8);
-    stableMap9 = StableBTreeMap<number, string[]>(9);
+    stableMap5 = new StableBTreeMap<[string] | [], number>(5);
+    stableMap6 = new StableBTreeMap<bigint[], boolean>(6);
+    stableMap7 = new StableBTreeMap<null, null>(7);
+    stableMap8 = new StableBTreeMap<boolean, null>(8);
+    stableMap9 = new StableBTreeMap<number, string[]>(9);
 
     @query([], IDL.Bool)
     getRedeployed(): boolean {

diff --git a/examples/stable/test/end_to_end/candid_rpc/stable_structures/src/canister3/index.ts b/examples/stable/test/end_to_end/candid_rpc/stable_structures/src/canister3/index.ts
@@ -3,14 +3,14 @@ import { IDL, Principal, query, StableBTreeMap, update } from 'azle';
 import { Callback, Reaction, User } from '../types';
 
 export default class {
-    stableMap10 = StableBTreeMap<number, [boolean] | []>(10);
-    stableMap11 = StableBTreeMap<bigint, User>(11);
-    stableMap12 = StableBTreeMap<Uint8Array, Reaction>(12);
-    stableMap13 = StableBTreeMap<string, Principal>(13);
-    stableMap14 = StableBTreeMap<string, Callback>(14);
-    stableMap15 = StableBTreeMap<Callback, string>(15);
-    stableMap16 = StableBTreeMap<string, object>(16);
-    stableMap17 = StableBTreeMap<object, string>(17);
+    stableMap10 = new StableBTreeMap<number, [boolean] | []>(10);
+    stableMap11 = new StableBTreeMap<bigint, User>(11);
+    stableMap12 = new StableBTreeMap<Uint8Array, Reaction>(12);
+    stableMap13 = new StableBTreeMap<string, Principal>(13);
+    stableMap14 = new StableBTreeMap<string, Callback>(14);
+    stableMap15 = new StableBTreeMap<Callback, string>(15);
+    stableMap16 = new StableBTreeMap<string, object>(16);
+    stableMap17 = new StableBTreeMap<object, string>(17);
 
     @query([], IDL.Bool)
     getRedeployed(): boolean {

diff --git a/examples/stable/test/property/candid_rpc/canister_methods/pre_upgrade/test/test.ts b/examples/stable/test/property/candid_rpc/canister_methods/pre_upgrade/test/test.ts
@@ -85,7 +85,7 @@ const CanisterConfigArb = fc
         > => {
             const globalDeclarations = [
                 /*TS*/ `const PRE_UPGRADE_HOOK_EXECUTED = 'PRE_UPGRADE_HOOK_EXECUTED';`,
-                /*TS*/ `let stable = StableBTreeMap<string, boolean>(0);`
+                /*TS*/ `let stable = new StableBTreeMap<string, boolean>(0);`
             ];
 
             return {

diff --git a/examples/stable/test/property/ic_api/caller/src/index.ts b/examples/stable/test/property/ic_api/caller/src/index.ts
@@ -17,7 +17,7 @@ import { AssertType, NotAnyAndExact } from 'azle/type_tests/assert_type';
 export default class {
     initCaller: Principal | null = null;
     postUpgradeCaller: Principal | null = null;
-    preUpgradeCaller = StableBTreeMap<'PRE_UPGRADE_CALLER', Principal>(0);
+    preUpgradeCaller = new StableBTreeMap<'PRE_UPGRADE_CALLER', Principal>(0);
     inspectMessageCaller: Principal | null = null;
 
     @init([])

diff --git a/examples/stable/test/property/ic_api/canister_version/src/index.ts b/examples/stable/test/property/ic_api/canister_version/src/index.ts
@@ -16,9 +16,10 @@ import { AssertType, NotAnyAndExact } from 'azle/type_tests/assert_type';
 export default class {
     initCanisterVersion: bigint | null = null;
     postUpgradeCanisterVersion: bigint | null = null;
-    preUpgradeCanisterVersion = StableBTreeMap<'PRE_UPGRADE_VERSION', bigint>(
-        0
-    );
+    preUpgradeCanisterVersion = new StableBTreeMap<
+        'PRE_UPGRADE_VERSION',
+        bigint
+    >(0);
     inspectMessageCanisterVersion: bigint | null = null;
     meaninglessState: bigint = 0n;
 

diff --git a/examples/stable/test/property/ic_api/certified_data/src/index.ts b/examples/stable/test/property/ic_api/certified_data/src/index.ts
@@ -28,7 +28,7 @@ const PRE_UPGRADE_DATA = new Uint8Array([
 
 export default class {
     data: Uint8Array = new Uint8Array();
-    stableStorage = StableBTreeMap<string, boolean>(0);
+    stableStorage = new StableBTreeMap<string, boolean>(0);
     afterFirstPostUpgrade = false;
 
     @init([IDL.Bool, IDL.Vec(IDL.Nat8)])

diff --git a/examples/stable/test/property/ic_api/id/src/index.ts b/examples/stable/test/property/ic_api/id/src/index.ts
@@ -17,7 +17,7 @@ import { AssertType, NotAnyAndExact } from 'azle/type_tests/assert_type';
 export default class {
     initId: Principal | null = null;
     postUpgradeId: Principal | null = null;
-    preUpgradeId = StableBTreeMap<'PRE_UPGRADE_ID', Principal>(0);
+    preUpgradeId = new StableBTreeMap<'PRE_UPGRADE_ID', Principal>(0);
     inspectMessageId: Principal | null = null;
 
     @init([])