move rust

demergent-labs · Aug 27, 2024 · b9ee2a2 · b9ee2a2
1 parent ca4916d
commit b9ee2a2
Show file tree

Hide file tree

Showing 74 changed files with 13 additions and 8 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,2 +1,2 @@
 [workspace]
-members = ["src/compiler/rust/canister", "src/compiler/rust/open_value_sharing"]
+members = ["src/build/rust/canister", "src/build/rust/open_value_sharing"]
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/wasm_binary/prepare_rust_staging_area.ts b/src/build/experimental/commands/compile/wasm_binary/prepare_rust_staging_area.ts
@@ -24,7 +24,7 @@ export async function prepareRustStagingArea(
     }
 
     await copy(
-        `${AZLE_PACKAGE_PATH}/src/compiler/rust/canister`,
+        `${AZLE_PACKAGE_PATH}/src/build/rust/canister`,
         `${canisterPath}/canister`
     );
 
@@ -33,7 +33,7 @@ export async function prepareRustStagingArea(
     }
 
     await copy(
-        `${AZLE_PACKAGE_PATH}/src/compiler/rust/open_value_sharing`,
+        `${AZLE_PACKAGE_PATH}/src/build/rust/open_value_sharing`,
         `${canisterPath}/open_value_sharing`
     );
 }
diff --git a/src/compiler/rust/canister/Cargo.toml → src/build/rust/canister/Cargo.toml b/src/compiler/rust/canister/Cargo.toml → src/build/rust/canister/Cargo.toml
diff --git a/src/compiler/rust/canister/src/autoreload.rs → src/build/rust/canister/src/autoreload.rs b/src/compiler/rust/canister/src/autoreload.rs → src/build/rust/canister/src/autoreload.rs
diff --git a/src/compiler/rust/canister/src/candid.rs → src/build/rust/canister/src/candid.rs b/src/compiler/rust/canister/src/candid.rs → src/build/rust/canister/src/candid.rs
diff --git a/src/compiler/rust/canister/src/chunk.rs → src/build/rust/canister/src/chunk.rs b/src/compiler/rust/canister/src/chunk.rs → src/build/rust/canister/src/chunk.rs
diff --git a/...er/rust/canister/src/execute_method_js.rs → ...ld/rust/canister/src/execute_method_js.rs b/...er/rust/canister/src/execute_method_js.rs → ...ld/rust/canister/src/execute_method_js.rs
diff --git a/src/compiler/rust/canister/src/guards.rs → src/build/rust/canister/src/guards.rs b/src/compiler/rust/canister/src/guards.rs → src/build/rust/canister/src/guards.rs
diff --git a/...er/rust/canister/src/ic/accept_message.rs → ...ld/rust/canister/src/ic/accept_message.rs b/...er/rust/canister/src/ic/accept_message.rs → ...ld/rust/canister/src/ic/accept_message.rs
diff --git a/...iler/rust/canister/src/ic/arg_data_raw.rs → ...uild/rust/canister/src/ic/arg_data_raw.rs b/...iler/rust/canister/src/ic/arg_data_raw.rs → ...uild/rust/canister/src/ic/arg_data_raw.rs
diff --git a/...compiler/rust/canister/src/ic/call_raw.rs → src/build/rust/canister/src/ic/call_raw.rs b/...compiler/rust/canister/src/ic/call_raw.rs → src/build/rust/canister/src/ic/call_raw.rs
diff --git a/src/compiler/rust/canister/src/ic/caller.rs → src/build/rust/canister/src/ic/caller.rs b/src/compiler/rust/canister/src/ic/caller.rs → src/build/rust/canister/src/ic/caller.rs
diff --git a/...r/rust/canister/src/ic/candid_compiler.rs → ...d/rust/canister/src/ic/candid_compiler.rs b/...r/rust/canister/src/ic/candid_compiler.rs → ...d/rust/canister/src/ic/candid_compiler.rs
diff --git a/...ler/rust/canister/src/ic/candid_decode.rs → ...ild/rust/canister/src/ic/candid_decode.rs b/...ler/rust/canister/src/ic/candid_decode.rs → ...ild/rust/canister/src/ic/candid_decode.rs
diff --git a/...ler/rust/canister/src/ic/candid_encode.rs → ...ild/rust/canister/src/ic/candid_encode.rs b/...ler/rust/canister/src/ic/candid_encode.rs → ...ild/rust/canister/src/ic/candid_encode.rs
diff --git a/.../rust/canister/src/ic/canister_balance.rs → .../rust/canister/src/ic/canister_balance.rs b/.../rust/canister/src/ic/canister_balance.rs → .../rust/canister/src/ic/canister_balance.rs
diff --git a/.../rust/canister/src/ic/canister_version.rs → .../rust/canister/src/ic/canister_version.rs b/.../rust/canister/src/ic/canister_version.rs → .../rust/canister/src/ic/canister_version.rs
diff --git a/...piler/rust/canister/src/ic/clear_timer.rs → ...build/rust/canister/src/ic/clear_timer.rs b/...piler/rust/canister/src/ic/clear_timer.rs → ...build/rust/canister/src/ic/clear_timer.rs
diff --git a/.../rust/canister/src/ic/data_certificate.rs → .../rust/canister/src/ic/data_certificate.rs b/.../rust/canister/src/ic/data_certificate.rs → .../rust/canister/src/ic/data_certificate.rs
diff --git a/src/compiler/rust/canister/src/ic/id.rs → src/build/rust/canister/src/ic/id.rs b/src/compiler/rust/canister/src/ic/id.rs → src/build/rust/canister/src/ic/id.rs
diff --git a/...st/canister/src/ic/instruction_counter.rs → ...st/canister/src/ic/instruction_counter.rs b/...st/canister/src/ic/instruction_counter.rs → ...st/canister/src/ic/instruction_counter.rs
diff --git a/...ler/rust/canister/src/ic/is_controller.rs → ...ild/rust/canister/src/ic/is_controller.rs b/...ler/rust/canister/src/ic/is_controller.rs → ...ild/rust/canister/src/ic/is_controller.rs
diff --git a/...piler/rust/canister/src/ic/method_name.rs → ...build/rust/canister/src/ic/method_name.rs b/...piler/rust/canister/src/ic/method_name.rs → ...build/rust/canister/src/ic/method_name.rs
diff --git a/src/compiler/rust/canister/src/ic/mod.rs → src/build/rust/canister/src/ic/mod.rs b/src/compiler/rust/canister/src/ic/mod.rs → src/build/rust/canister/src/ic/mod.rs
diff --git a/...rust/canister/src/ic/msg_cycles_accept.rs → ...rust/canister/src/ic/msg_cycles_accept.rs b/...rust/canister/src/ic/msg_cycles_accept.rs → ...rust/canister/src/ic/msg_cycles_accept.rs
diff --git a/...t/canister/src/ic/msg_cycles_available.rs → ...t/canister/src/ic/msg_cycles_available.rs b/...t/canister/src/ic/msg_cycles_available.rs → ...t/canister/src/ic/msg_cycles_available.rs
diff --git a/...st/canister/src/ic/msg_cycles_refunded.rs → ...st/canister/src/ic/msg_cycles_refunded.rs b/...st/canister/src/ic/msg_cycles_refunded.rs → ...st/canister/src/ic/msg_cycles_refunded.rs
diff --git a/...mpiler/rust/canister/src/ic/notify_raw.rs → src/build/rust/canister/src/ic/notify_raw.rs b/...mpiler/rust/canister/src/ic/notify_raw.rs → src/build/rust/canister/src/ic/notify_raw.rs
diff --git a/...st/canister/src/ic/performance_counter.rs → ...st/canister/src/ic/performance_counter.rs b/...st/canister/src/ic/performance_counter.rs → ...st/canister/src/ic/performance_counter.rs
diff --git a/src/compiler/rust/canister/src/ic/print.rs → src/build/rust/canister/src/ic/print.rs b/src/compiler/rust/canister/src/ic/print.rs → src/build/rust/canister/src/ic/print.rs
diff --git a/src/compiler/rust/canister/src/ic/reject.rs → src/build/rust/canister/src/ic/reject.rs b/src/compiler/rust/canister/src/ic/reject.rs → src/build/rust/canister/src/ic/reject.rs
diff --git a/...piler/rust/canister/src/ic/reject_code.rs → ...build/rust/canister/src/ic/reject_code.rs b/...piler/rust/canister/src/ic/reject_code.rs → ...build/rust/canister/src/ic/reject_code.rs
diff --git a/...er/rust/canister/src/ic/reject_message.rs → ...ld/rust/canister/src/ic/reject_message.rs b/...er/rust/canister/src/ic/reject_message.rs → ...ld/rust/canister/src/ic/reject_message.rs
diff --git a/...ompiler/rust/canister/src/ic/reply_raw.rs → src/build/rust/canister/src/ic/reply_raw.rs b/...ompiler/rust/canister/src/ic/reply_raw.rs → src/build/rust/canister/src/ic/reply_raw.rs
diff --git a/...ust/canister/src/ic/set_certified_data.rs → ...ust/canister/src/ic/set_certified_data.rs b/...ust/canister/src/ic/set_certified_data.rs → ...ust/canister/src/ic/set_certified_data.rs
diff --git a/...ompiler/rust/canister/src/ic/set_timer.rs → src/build/rust/canister/src/ic/set_timer.rs b/...ompiler/rust/canister/src/ic/set_timer.rs → src/build/rust/canister/src/ic/set_timer.rs
diff --git a/...ust/canister/src/ic/set_timer_interval.rs → ...ust/canister/src/ic/set_timer_interval.rs b/...ust/canister/src/ic/set_timer_interval.rs → ...ust/canister/src/ic/set_timer_interval.rs
diff --git a/.../src/ic/stable_b_tree_map_contains_key.rs → .../src/ic/stable_b_tree_map_contains_key.rs b/.../src/ic/stable_b_tree_map_contains_key.rs → .../src/ic/stable_b_tree_map_contains_key.rs
diff --git a/.../canister/src/ic/stable_b_tree_map_get.rs → .../canister/src/ic/stable_b_tree_map_get.rs b/.../canister/src/ic/stable_b_tree_map_get.rs → .../canister/src/ic/stable_b_tree_map_get.rs
diff --git a/...canister/src/ic/stable_b_tree_map_init.rs → ...canister/src/ic/stable_b_tree_map_init.rs b/...canister/src/ic/stable_b_tree_map_init.rs → ...canister/src/ic/stable_b_tree_map_init.rs
diff --git a/...nister/src/ic/stable_b_tree_map_insert.rs → ...nister/src/ic/stable_b_tree_map_insert.rs b/...nister/src/ic/stable_b_tree_map_insert.rs → ...nister/src/ic/stable_b_tree_map_insert.rs
diff --git a/...ster/src/ic/stable_b_tree_map_is_empty.rs → ...ster/src/ic/stable_b_tree_map_is_empty.rs b/...ster/src/ic/stable_b_tree_map_is_empty.rs → ...ster/src/ic/stable_b_tree_map_is_empty.rs
diff --git a/...anister/src/ic/stable_b_tree_map_items.rs → ...anister/src/ic/stable_b_tree_map_items.rs b/...anister/src/ic/stable_b_tree_map_items.rs → ...anister/src/ic/stable_b_tree_map_items.rs
diff --git a/...canister/src/ic/stable_b_tree_map_keys.rs → ...canister/src/ic/stable_b_tree_map_keys.rs b/...canister/src/ic/stable_b_tree_map_keys.rs → ...canister/src/ic/stable_b_tree_map_keys.rs
diff --git a/.../canister/src/ic/stable_b_tree_map_len.rs → .../canister/src/ic/stable_b_tree_map_len.rs b/.../canister/src/ic/stable_b_tree_map_len.rs → .../canister/src/ic/stable_b_tree_map_len.rs
diff --git a/...nister/src/ic/stable_b_tree_map_remove.rs → ...nister/src/ic/stable_b_tree_map_remove.rs b/...nister/src/ic/stable_b_tree_map_remove.rs → ...nister/src/ic/stable_b_tree_map_remove.rs
diff --git a/...nister/src/ic/stable_b_tree_map_values.rs → ...nister/src/ic/stable_b_tree_map_values.rs b/...nister/src/ic/stable_b_tree_map_values.rs → ...nister/src/ic/stable_b_tree_map_values.rs
diff --git a/src/compiler/rust/canister/src/ic/time.rs → src/build/rust/canister/src/ic/time.rs b/src/compiler/rust/canister/src/ic/time.rs → src/build/rust/canister/src/ic/time.rs
diff --git a/src/compiler/rust/canister/src/ic/trap.rs → src/build/rust/canister/src/ic/trap.rs b/src/compiler/rust/canister/src/ic/trap.rs → src/build/rust/canister/src/ic/trap.rs
diff --git a/...ust/canister/src/init_and_post_upgrade.rs → ...ust/canister/src/init_and_post_upgrade.rs b/...ust/canister/src/init_and_post_upgrade.rs → ...ust/canister/src/init_and_post_upgrade.rs
diff --git a/src/compiler/rust/canister/src/lib.rs → src/build/rust/canister/src/lib.rs b/src/compiler/rust/canister/src/lib.rs → src/build/rust/canister/src/lib.rs
@@ -1,3 +1,8 @@
+// TODO the plan is to integrate rquickjs for stable
+// TODO and at that time create two crates
+// TODO we should place each crate at src/build/stable/commands/compile/rust
+// TODO and src/build/experimental/commands/compile/rust respectively
+
 use std::cell::RefCell;
 
 #[allow(unused)]

diff --git a/...er/rust/canister/src/stable_b_tree_map.rs → ...ld/rust/canister/src/stable_b_tree_map.rs b/...er/rust/canister/src/stable_b_tree_map.rs → ...ld/rust/canister/src/stable_b_tree_map.rs
diff --git a/...rc/upload_file/bytes_to_human_readable.rs → ...rc/upload_file/bytes_to_human_readable.rs b/...rc/upload_file/bytes_to_human_readable.rs → ...rc/upload_file/bytes_to_human_readable.rs
diff --git a/...ust/canister/src/upload_file/file_info.rs → ...ust/canister/src/upload_file/file_info.rs b/...ust/canister/src/upload_file/file_info.rs → ...ust/canister/src/upload_file/file_info.rs
diff --git a/...ler/rust/canister/src/upload_file/hash.rs → ...ild/rust/canister/src/upload_file/hash.rs b/...ler/rust/canister/src/upload_file/hash.rs → ...ild/rust/canister/src/upload_file/hash.rs
diff --git a/...iler/rust/canister/src/upload_file/mod.rs → ...uild/rust/canister/src/upload_file/mod.rs b/...iler/rust/canister/src/upload_file/mod.rs → ...uild/rust/canister/src/upload_file/mod.rs
diff --git a/...er/rust/canister/src/upload_file/reset.rs → ...ld/rust/canister/src/upload_file/reset.rs b/...er/rust/canister/src/upload_file/reset.rs → ...ld/rust/canister/src/upload_file/reset.rs
diff --git a/...ster/src/upload_file/upload_file_chunk.rs → ...ster/src/upload_file/upload_file_chunk.rs b/...ster/src/upload_file/upload_file_chunk.rs → ...ster/src/upload_file/upload_file_chunk.rs
diff --git a/.../canister/src/wasm_binary_manipulation.rs → .../canister/src/wasm_binary_manipulation.rs b/.../canister/src/wasm_binary_manipulation.rs → .../canister/src/wasm_binary_manipulation.rs
diff --git a/.../canister/src/web_assembly/instantiate.rs → .../canister/src/web_assembly/instantiate.rs b/.../canister/src/web_assembly/instantiate.rs → .../canister/src/web_assembly/instantiate.rs
diff --git a/...ler/rust/canister/src/web_assembly/mod.rs → ...ild/rust/canister/src/web_assembly/mod.rs b/...ler/rust/canister/src/web_assembly/mod.rs → ...ild/rust/canister/src/web_assembly/mod.rs
diff --git a/...mpiler/rust/open_value_sharing/Cargo.toml → src/build/rust/open_value_sharing/Cargo.toml b/...mpiler/rust/open_value_sharing/Cargo.toml → src/build/rust/open_value_sharing/Cargo.toml
diff --git a/...mpiler/rust/open_value_sharing/src/lib.rs → src/build/rust/open_value_sharing/src/lib.rs b/...mpiler/rust/open_value_sharing/src/lib.rs → src/build/rust/open_value_sharing/src/lib.rs
diff --git a/...haring/src/platforms/icp/assets/cycles.rs → ...haring/src/platforms/icp/assets/cycles.rs b/...haring/src/platforms/icp/assets/cycles.rs → ...haring/src/platforms/icp/assets/cycles.rs
diff --git a/...e_sharing/src/platforms/icp/assets/mod.rs → ...e_sharing/src/platforms/icp/assets/mod.rs b/...e_sharing/src/platforms/icp/assets/mod.rs → ...e_sharing/src/platforms/icp/assets/mod.rs
diff --git a/...en_value_sharing/src/platforms/icp/mod.rs → ...en_value_sharing/src/platforms/icp/mod.rs b/...en_value_sharing/src/platforms/icp/mod.rs → ...en_value_sharing/src/platforms/icp/mod.rs
diff --git a/...t/open_value_sharing/src/platforms/mod.rs → ...t/open_value_sharing/src/platforms/mod.rs b/...t/open_value_sharing/src/platforms/mod.rs → ...t/open_value_sharing/src/platforms/mod.rs
diff --git a/...t/open_value_sharing/src/query_methods.rs → ...t/open_value_sharing/src/query_methods.rs b/...t/open_value_sharing/src/query_methods.rs → ...t/open_value_sharing/src/query_methods.rs
diff --git a/...r/rust/open_value_sharing/src/test/mod.rs → ...d/rust/open_value_sharing/src/test/mod.rs b/...r/rust/open_value_sharing/src/test/mod.rs → ...d/rust/open_value_sharing/src/test/mod.rs
diff --git a/src/build/stable/commands/compile/wasm_binary/prepare_rust_staging_area.ts b/src/build/stable/commands/compile/wasm_binary/prepare_rust_staging_area.ts
@@ -24,7 +24,7 @@ export async function prepareRustStagingArea(
     }
 
     await copy(
-        `${AZLE_PACKAGE_PATH}/src/compiler/rust/canister`,
+        `${AZLE_PACKAGE_PATH}/src/build/rust/canister`,
         `${canisterPath}/canister`
     );
 
@@ -33,7 +33,7 @@ export async function prepareRustStagingArea(
     }
 
     await copy(
-        `${AZLE_PACKAGE_PATH}/src/compiler/rust/open_value_sharing`,
+        `${AZLE_PACKAGE_PATH}/src/build/rust/open_value_sharing`,
         `${canisterPath}/open_value_sharing`
     );
 }
diff --git a/tests/end_to_end/http_server/large_files/test/authorization_tests.ts b/tests/end_to_end/http_server/large_files/test/authorization_tests.ts
@@ -1,5 +1,5 @@
 import { generateIdentity, getCanisterId } from 'azle/dfx';
-import { createActor } from 'azle/src/compiler/file_uploader/uploader_actor';
+import { createActor } from 'azle/src/build/experimental/commands/upload_assets/file_uploader/uploader_actor';
 import { expect, it, please, Test } from 'azle/test';
 import { v4 } from 'uuid';
 

diff --git a/tests/end_to_end/http_server/large_files/test/tests.ts b/tests/end_to_end/http_server/large_files/test/tests.ts
@@ -1,14 +1,14 @@
 import { afterAll, beforeAll, describe } from '@jest/globals';
 import { getCanisterId } from 'azle/dfx';
 import { hashFile } from 'azle/scripts/hash_file';
-import { createActor } from 'azle/src/compiler/file_uploader/uploader_actor';
+import { createActor } from 'azle/src/build/experimental/commands/upload_assets/file_uploader/uploader_actor';
 import { expect, it, please, Test } from 'azle/test';
 import { execSync } from 'child_process';
 import { readdir, rm } from 'fs/promises';
 import { join } from 'path';
 
 import { Unit } from '../../../../../scripts/file_generator';
-import { AZLE_UPLOADER_IDENTITY_NAME } from '../../../../../src/compiler/uploader_identity';
+import { AZLE_UPLOADER_IDENTITY_NAME } from '../../../../../src/build/experimental/commands/upload_assets/uploader_identity';
 import { getAuthorizationTests } from './authorization_tests';
 import { generateFiles, getDfxConfigFileTests } from './auto_tests';
 import { generateTestFileOfSize } from './generate_test_files';