Update build process to use candid-extractor and add cdylib crate types

itsyaasir · itsyaasir · commit 1a18fe5452ba · 2025-03-25T10:20:39.000+03:00
diff --git a/ic-canister/tests/canister-a/Cargo.toml b/ic-canister/tests/canister-a/Cargo.toml
@@ -3,6 +3,9 @@ name = "canister-a"
 version.workspace = true
 edition.workspace = true
 
+[lib]
+crate-type = ["cdylib", "rlib"]
+
 [features]
 default = []
 export-api = []
diff --git a/ic-canister/tests/canister-a/src/lib.rs b/ic-canister/tests/canister-a/src/lib.rs
@@ -8,6 +8,12 @@ use ic_exports::candid::{CandidType, Deserialize, Principal};
 use ic_storage::stable::Versioned;
 use ic_storage::IcStorage;
 
+#[ic_canister::export_candid]
+pub fn idl() -> String {
+    let idl = CanisterAImpl::get_idl();
+    candid::pretty::candid::compile(&idl.env.env, &Some(idl.actor))
+}
+
 #[derive(Default, CandidType, Deserialize, IcStorage)]
 pub struct StateA {
     counter: u32,
diff --git a/ic-canister/tests/canister-a/src/main.rs b/ic-canister/tests/canister-a/src/main.rs
diff --git a/ic-canister/tests/canister-b/Cargo.toml b/ic-canister/tests/canister-b/Cargo.toml
@@ -3,6 +3,9 @@ name = "canister-b"
 version.workspace = true
 edition.workspace = true
 
+[lib]
+crate-type = ["cdylib", "rlib"]
+
 [features]
 default = []
 export-api = []
diff --git a/ic-canister/tests/canister-b/src/lib.rs b/ic-canister/tests/canister-b/src/lib.rs
@@ -9,6 +9,17 @@ use ic_canister::{
 use ic_exports::candid::{CandidType, Deserialize, Principal};
 use ic_storage::IcStorage;
 
+// #[ic_canister::export_candid]
+pub fn canister_b_idl() -> String {
+    use ic_canister::Idl;
+
+    let canister_b_idl = generate_idl!();
+    let mut canister_a_idl = <CanisterB as CanisterA>::get_idl();
+    canister_a_idl.merge(&canister_b_idl);
+
+    candid::pretty::candid::compile(&canister_a_idl.env.env, &Some(canister_a_idl.actor))
+}
+
 #[derive(IcStorage, CandidType, Deserialize)]
 struct StateB {
     canister_a: Principal,
@@ -108,16 +119,6 @@ impl CanisterA for CanisterB {
     }
 }
 
-pub fn idl() -> String {
-    use ic_canister::Idl;
-
-    let canister_b_idl = generate_idl!();
-    let mut canister_a_idl = <CanisterB as CanisterA>::get_idl();
-    canister_a_idl.merge(&canister_b_idl);
-
-    candid::pretty::candid::compile(&canister_a_idl.env.env, &Some(canister_a_idl.actor))
-}
-
 #[cfg(test)]
 mod tests {
     use ic_exports::ic_kit::mock_principals::alice;
diff --git a/ic-canister/tests/canister-b/src/main.rs b/ic-canister/tests/canister-b/src/main.rs
diff --git a/ic-canister/tests/canister-c/Cargo.toml b/ic-canister/tests/canister-c/Cargo.toml
@@ -3,6 +3,9 @@ name = "canister-c"
 version.workspace = true
 edition.workspace = true
 
+[lib]
+crate-type = ["cdylib", "rlib"]
+
 [features]
 default = []
 export-api = []
diff --git a/ic-canister/tests/canister-c/src/lib.rs b/ic-canister/tests/canister-c/src/lib.rs
@@ -53,6 +53,7 @@ impl PreUpdate for CanisterC {
     }
 }
 
+#[ic_canister::export_candid]
 pub fn idl() -> String {
     use ic_canister::Idl;
 
diff --git a/ic-canister/tests/canister-c/src/main.rs b/ic-canister/tests/canister-c/src/main.rs
diff --git a/ic-canister/tests/canister-d/Cargo.toml b/ic-canister/tests/canister-d/Cargo.toml
@@ -3,6 +3,9 @@ name = "canister-d"
 version.workspace = true
 edition.workspace = true
 
+[lib]
+crate-type = ["cdylib", "rlib"]
+
 [features]
 default = []
 export-api = []
diff --git a/ic-canister/tests/canister-d/src/lib.rs b/ic-canister/tests/canister-d/src/lib.rs
@@ -51,6 +51,7 @@ pub trait CanisterD: Canister {
 
 generate_exports!(CanisterD, CanisterDImpl);
 
+#[ic_canister::export_candid]
 pub fn idl() -> String {
     let trait_idl = <CanisterDImpl as CanisterD>::get_idl();
     candid::pretty::candid::compile(&trait_idl.env.env, &Some(trait_idl.actor))
diff --git a/ic-canister/tests/canister-d/src/main.rs b/ic-canister/tests/canister-d/src/main.rs
diff --git a/ic-canister/tests/canister-e/Cargo.toml b/ic-canister/tests/canister-e/Cargo.toml
@@ -3,6 +3,9 @@ name = "canister-e"
 version.workspace = true
 edition.workspace = true
 
+[lib]
+crate-type = ["cdylib", "rlib"]
+
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [features]
diff --git a/ic-canister/tests/canister-e/src/lib.rs b/ic-canister/tests/canister-e/src/lib.rs
@@ -73,3 +73,10 @@ impl CounterCanister {
         generate_idl!()
     }
 }
+
+#[ic_canister::export_candid]
+pub fn idl() -> String {
+    let idl = CounterCanister::idl();
+
+    candid::pretty::candid::compile(&idl.env.env, &Some(idl.actor))
+}
diff --git a/ic-canister/tests/canister-e/src/main.rs b/ic-canister/tests/canister-e/src/main.rs
diff --git a/ic-log/Cargo.toml b/ic-log/Cargo.toml
@@ -3,6 +3,9 @@ name = "ic-log"
 version.workspace = true
 edition.workspace = true
 
+[lib]
+crate-type = ["cdylib", "rlib"]
+
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
@@ -24,7 +27,13 @@ serde = { workspace = true }
 ic-canister = { path = "../ic-canister/ic-canister" }
 
 [features]
-canister = ["export-api", "ic-canister", "ic-storage", "ic-stable-structures", "cfg-if"]
+canister = [
+    "export-api",
+    "ic-canister",
+    "ic-storage",
+    "ic-stable-structures",
+    "cfg-if",
+]
 export-api = []
 
 [[example]]
diff --git a/ic-log/examples/log_canister.rs b/ic-log/examples/log_canister.rs
@@ -12,6 +12,13 @@ use ic_stable_structures::stable_structures::DefaultMemoryImpl;
 use ic_stable_structures::{IcMemoryManager, MemoryId};
 use ic_storage::IcStorage;
 
+#[ic_canister::export_candid]
+pub fn idl() -> String {
+    let idl = LoggerCanister::get_idl();
+
+    candid::pretty::candid::compile(&idl.env.env, &Some(idl.actor))
+}
+
 thread_local! {
     static MEMORY_MANAGER: IcMemoryManager<DefaultMemoryImpl> = IcMemoryManager::init(DefaultMemoryImpl::default());
 }
diff --git a/ic-payments/test-payment-canister/Cargo.toml b/ic-payments/test-payment-canister/Cargo.toml
@@ -3,6 +3,9 @@ name = "test-payment-canister"
 version.workspace = true
 edition.workspace = true
 
+[lib]
+crate-type = ["cdylib", "rlib"]
+
 [features]
 default = []
 export-api = []
diff --git a/ic-payments/test-payment-canister/src/canister.rs b/ic-payments/test-payment-canister/src/canister.rs
@@ -4,7 +4,7 @@
 use std::collections::HashMap;
 
 use candid::Nat;
-use ic_canister::{init, update, Canister, PreUpdate};
+use ic_canister::{generate_idl, init, update, Canister, Idl, PreUpdate};
 use ic_exports::candid::{CandidType, Deserialize, Principal};
 use ic_exports::ic_kit::ic;
 use ic_exports::icrc_types::icrc1::account::Account;
@@ -148,4 +148,8 @@ impl PaymentCanister {
 
         (local_balance, token_canister_balance)
     }
+
+    pub fn idl() -> Idl {
+        generate_idl!()
+    }
 }
diff --git a/ic-payments/test-payment-canister/src/lib.rs b/ic-payments/test-payment-canister/src/lib.rs
@@ -0,0 +1,10 @@
+use canister::PaymentCanister;
+
+pub mod canister;
+
+#[ic_canister::export_candid]
+pub fn idl() -> String {
+    let idl = PaymentCanister::idl();
+
+    candid::pretty::candid::compile(&idl.env.env, &Some(idl.actor))
+}
diff --git a/ic-payments/test-payment-canister/src/main.rs b/ic-payments/test-payment-canister/src/main.rs
diff --git a/ic-stable-structures/tests/dummy_canister/Cargo.toml b/ic-stable-structures/tests/dummy_canister/Cargo.toml
@@ -3,6 +3,9 @@ name = "dummy_canister"
 version.workspace = true
 edition.workspace = true
 
+[lib]
+crate-type = ["cdylib", "rlib"]
+
 [features]
 default = []
 export-api = []
diff --git a/ic-stable-structures/tests/dummy_canister/src/lib.rs b/ic-stable-structures/tests/dummy_canister/src/lib.rs
@@ -0,0 +1,11 @@
+pub mod canister;
+
+use canister::DummyCanister;
+
+#[ic_canister::export_candid]
+pub fn idl() -> String {
+    let canister_e_idl = DummyCanister::idl();
+    
+
+    candid::pretty::candid::compile(&canister_e_idl.env.env, &Some(canister_e_idl.actor))
+}
diff --git a/ic-stable-structures/tests/dummy_canister/src/main.rs b/ic-stable-structures/tests/dummy_canister/src/main.rs
diff --git a/ic-task-scheduler/tests/dummy_scheduler_canister/Cargo.toml b/ic-task-scheduler/tests/dummy_scheduler_canister/Cargo.toml
@@ -3,6 +3,9 @@ name = "dummy_scheduler_canister"
 version.workspace = true
 edition.workspace = true
 
+[lib]
+crate-type = ["cdylib", "rlib"]
+
 [features]
 default = []
 export-api = []
diff --git a/ic-task-scheduler/tests/dummy_scheduler_canister/src/lib.rs b/ic-task-scheduler/tests/dummy_scheduler_canister/src/lib.rs
@@ -44,6 +44,14 @@ thread_local! {
 
 }
 
+#[ic_canister::export_candid]
+fn idl() -> String {
+    let canister_e_idl = DummyCanister::idl();
+    
+
+    candid::pretty::candid::compile(&canister_e_idl.env.env, &Some(canister_e_idl.actor))
+}
+
 #[derive(CandidType, Serialize, Deserialize, Debug, Clone)]
 pub enum DummyTask {
     Panicking,
diff --git a/ic-task-scheduler/tests/dummy_scheduler_canister/src/main.rs b/ic-task-scheduler/tests/dummy_scheduler_canister/src/main.rs
diff --git a/just/build.just b/just/build.just
@@ -13,47 +13,46 @@ build: pre_build build_ic_stable_structures_dummy_canister build_ic_canister_tes
 
 
 [private]
-pre_build: 
+pre_build:
   mkdir -p "{{WASM_DIR}}"
-  
 
 [private]
 build_ic_stable_structures_dummy_canister:
-  cargo run -p dummy_canister --features export-api > {{WASM_DIR}}/dummy_canister.did
   cargo build -p dummy_canister --target wasm32-unknown-unknown --features export-api --release
-  ic-wasm {{WASM_DIR}}/dummy_canister.wasm -o {{WASM_DIR}}/dummy_canister.wasm shrink
+  ic-wasm {{WASM_DIR}}/dummy_canister.wasm -o {{WASM_DIR}}/dummy_canister.wasm shrink --keep-name-section
+  candid-extractor "{{WASM_DIR}}/dummy_canister.wasm" > "{{WASM_DIR}}/dummy_canister.did"
 
 
 [private]
 build_ic_canister_test_canisters:
-  cargo run -p canister-a --features export-api > {{WASM_DIR}}/canister-a.did
-  cargo run -p canister-b --features export-api > {{WASM_DIR}}/canister-b.did
-  cargo run -p canister-c --features export-api > {{WASM_DIR}}/canister-c.did
-  cargo run -p canister-d --features export-api > {{WASM_DIR}}/canister-d.did
-
   cargo build -p canister-a --target wasm32-unknown-unknown --features export-api --release
   cargo build -p canister-b --target wasm32-unknown-unknown --features export-api --release
   cargo build -p canister-c --target wasm32-unknown-unknown --features export-api --release
   cargo build -p canister-d --target wasm32-unknown-unknown --features export-api --release
 
-  ic-wasm {{WASM_DIR}}/canister-a.wasm -o {{WASM_DIR}}/canister-a.wasm shrink
-  ic-wasm {{WASM_DIR}}/canister-b.wasm -o {{WASM_DIR}}/canister-b.wasm shrink
-  ic-wasm {{WASM_DIR}}/canister-c.wasm -o {{WASM_DIR}}/canister-c.wasm shrink
-  ic-wasm {{WASM_DIR}}/canister-d.wasm -o {{WASM_DIR}}/canister-d.wasm shrink
+  ic-wasm {{WASM_DIR}}/canister_a.wasm -o {{WASM_DIR}}/canister_a.wasm shrink --keep-name-section
+  ic-wasm {{WASM_DIR}}/canister_b.wasm -o {{WASM_DIR}}/canister_b.wasm shrink --keep-name-section
+  ic-wasm {{WASM_DIR}}/canister_c.wasm -o {{WASM_DIR}}/canister_c.wasm shrink --keep-name-section
+  ic-wasm {{WASM_DIR}}/canister_d.wasm -o {{WASM_DIR}}/canister_d.wasm shrink --keep-name-section
+
+  candid-extractor "{{WASM_DIR}}/canister_a.wasm" > "{{WASM_DIR}}/canister_a.did"
+  candid-extractor "{{WASM_DIR}}/canister_b.wasm" > "{{WASM_DIR}}/canister_b.did"
+  candid-extractor "{{WASM_DIR}}/canister_c.wasm" > "{{WASM_DIR}}/canister_c.did"
+  candid-extractor "{{WASM_DIR}}/canister_d.wasm" > "{{WASM_DIR}}/canister_d.did"
 
 
 [private]
 build_ic_task_scheduler_dummy_scheduler_canister:
-  cargo run -p dummy_scheduler_canister --features export-api > {{WASM_DIR}}/dummy_scheduler_canister.did
   cargo build -p dummy_scheduler_canister --target wasm32-unknown-unknown --features export-api --release
-  ic-wasm {{WASM_DIR}}/dummy_scheduler_canister.wasm -o {{WASM_DIR}}/dummy_scheduler_canister.wasm shrink
+  ic-wasm {{WASM_DIR}}/dummy_scheduler_canister.wasm -o {{WASM_DIR}}/dummy_scheduler_canister.wasm shrink --keep-name-section
+  candid-extractor "{{WASM_DIR}}/dummy_scheduler_canister.wasm" > "{{WASM_DIR}}/dummy_scheduler_canister.did"
 
 
 [private]
 build_ic_log_test_canister:
-  cargo run -p ic-log --example log_canister --features canister > {{WASM_DIR}}/log_canister.did
   cargo build -p ic-log --example log_canister --target wasm32-unknown-unknown --features canister --release
-  ic-wasm {{WASM_DIR}}/examples/log_canister.wasm -o {{WASM_DIR}}/log_canister.wasm shrink
+  ic-wasm {{WASM_DIR}}/examples/log_canister.wasm -o {{WASM_DIR}}/log_canister.wasm shrink --keep-name-section
+  candid-extractor "{{WASM_DIR}}/log_canister.wasm" > "{{WASM_DIR}}/log_canister.did"
 
 
 [private]
@@ -70,5 +69,6 @@ build_ic_payments_test_canister:
   fi
 
   cargo build --target wasm32-unknown-unknown --features export-api -p test-payment-canister --release
-  ic-wasm {{WASM_DIR}}/test-payment-canister.wasm -o {{WASM_DIR}}/test-payment-canister.wasm shrink
+  ic-wasm {{WASM_DIR}}/test_payment_canister.wasm -o {{WASM_DIR}}/test_payment_canister.wasm shrink --keep-name-section
+  candid-extractor "{{WASM_DIR}}/test_payment_canister.wasm" > "{{WASM_DIR}}/test_payment_canister.did"
 

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,7 @@ impl PreUpdate for CanisterC {`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`
	`56`	`+#[ic_canister::export_candid]`
`56`	`57`	`pub fn idl() -> String {`
`57`	`58`	`use ic_canister::Idl;`
`58`	`59`