handle TODOs in build/experimental

demergent-labs · Aug 28, 2024 · c48acd5 · c48acd5
1 parent a903e55
commit c48acd5
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 9 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/src/build/experimental/commands/compile/get_context.ts b/src/build/experimental/commands/compile/get_context.ts
@@ -34,7 +34,7 @@ export async function getContext(
     const wasmData: WasmData = {
         ...stableContext.wasmData,
         consumer,
-        management_did: managementDid // TODO should we just do the camelCase snake case Rust thing to unify these across the languages?
+        managementDid
     };
 
     const wasmedgeQuickJsName = `wasmedge-quickjs_${version}`;

diff --git a/src/build/experimental/commands/compile/javascript.ts b/src/build/experimental/commands/compile/javascript.ts
@@ -39,10 +39,6 @@ export async function compile(
         );
 }
 
-// TODO clean this up beautifully
-// TODO make the CanisterMethods thing pristine
-// TODO it's a bit confusing right now
-// TODO do not repeat from stable
 export function getPrelude(main: string): string {
     return /*TS*/ `
         import 'azle/src/lib/stable/globals';
@@ -129,7 +125,6 @@ export function getBuildOptions(
         ...externalNotImplementedDev
     ];
 
-    // TODO we need to move custom_js_modules into build/experimental
     const customJsModulesPath = join(
         AZLE_PACKAGE_PATH,
         'src',

diff --git a/src/build/experimental/utils/types.ts b/src/build/experimental/utils/types.ts
@@ -15,5 +15,5 @@ export type Context = {
 
 export type WasmData = {
     consumer: Consumer;
-    management_did: string;
+    managementDid: string;
 } & StableWasmData;
diff --git a/src/build/rust/canister/src/wasm_binary_manipulation.rs b/src/build/rust/canister/src/wasm_binary_manipulation.rs
@@ -5,10 +5,12 @@ use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Serialize, Deserialize)]
 pub struct WasmData {
+    #[serde(rename = "envVars")]
     pub env_vars: Vec<(String, String)>,
     #[cfg(feature = "experimental")]
     pub consumer: Consumer,
     #[cfg(feature = "experimental")]
+    #[serde(rename = "managementDid")]
     pub management_did: String,
 }
 

diff --git a/src/build/stable/commands/compile/get_context.ts b/src/build/stable/commands/compile/get_context.ts
@@ -26,7 +26,7 @@ export function getContext(
 
     const envVars = getEnvVars(canisterConfig);
     const wasmData = {
-        env_vars: envVars
+        envVars
     };
 
     return {

diff --git a/src/build/stable/utils/types.ts b/src/build/stable/utils/types.ts
@@ -68,5 +68,5 @@ export type MethodMeta = {
 };
 
 export type WasmData = {
-    env_vars: EnvVars;
+    envVars: EnvVars;
 };