Generate canister instead of committing a binary

dfinity · Jan 17, 2024 · b874c44 · b874c44
1 parent c8d5f5e
commit b874c44
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 5 deletions.
diff --git a/e2e/assets/large_canister/Cargo.toml b/e2e/assets/large_canister/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "large"
+version = "0.0.0"
+edition = "2021"
+
+[lib]
+crate-type = ["cdylib"]
+
+[workspace]
diff --git a/e2e/assets/large_canister/dfx.json b/e2e/assets/large_canister/dfx.json
@@ -1,10 +1,9 @@
 {
     "canisters": {
         "large": {
-            "type": "custom",
-            "wasm": "large.wasm",
-            "candid": "large.did",
-            "build": []
+            "type": "rust",
+            "package": "large",
+            "candid": "large.did"
         } 
     }
 }
diff --git a/e2e/assets/large_canister/large.wasm b/e2e/assets/large_canister/large.wasm
diff --git a/e2e/assets/large_canister/patch.bash b/e2e/assets/large_canister/patch.bash
@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+head -c $((1024 * 1024 * 8)) /dev/urandom >garbage.bin
diff --git a/e2e/assets/large_canister/rust-toolchain.toml b/e2e/assets/large_canister/rust-toolchain.toml
@@ -0,0 +1,3 @@
+[toolchain]
+channel = "stable"
+targets = ["wasm32-unknown-unknown"]
diff --git a/e2e/assets/large_canister/src/lib.rs b/e2e/assets/large_canister/src/lib.rs
@@ -0,0 +1,3 @@
+#[used]
+#[no_mangle]
+pub static LARGE: &[u8] = include_bytes!(concat!(env!("CARGO_MANIFEST_DIR"), "/garbage.bin"));
diff --git a/e2e/tests-dfx/install.bash b/e2e/tests-dfx/install.bash
@@ -159,7 +159,7 @@ teardown() {
   assert_command dfx build
   assert_command dfx canister install --all
   assert_command dfx canister info large
-  assert_match "Module hash: 0x$(sha2sum large.wasm | head -c 64)"
+  assert_match "Module hash: 0x$(sha2sum .dfx/local/canisters/large/large.wasm.gz | head -c 64)"
 }
 
 @test "--mode=auto selects install or upgrade automatically" {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		#!/usr/bin/env bash
		head -c $((1024 * 1024 * 8)) /dev/urandom >garbage.bin