Move Rust files into rs directory

open-chat-labs · May 3, 2024 · 8b45700 · 8b45700
1 parent 9388997
commit 8b45700
Show file tree

Hide file tree

Showing 55 changed files with 13 additions and 11 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,13 +1,13 @@
 [workspace]
 members = [
-    "canister/api",
-    "canister/impl",
-    "email_sender/aws",
-    "email_sender/core",
-    "integration_tests",
-    "libraries/magic_links",
-    "libraries/test_utils",
-    "libraries/utils",
+    "rs/canister/api",
+    "rs/canister/impl",
+    "rs/email_sender/aws",
+    "rs/email_sender/core",
+    "rs/integration_tests",
+    "rs/libraries/magic_links",
+    "rs/libraries/test_utils",
+    "rs/libraries/utils",
 ]
 resolver = "2"
 

diff --git a/dfx.json b/dfx.json
@@ -3,7 +3,7 @@
     "sign_in_with_email": {
       "type": "rust",
       "package": "sign_in_with_email_canister_impl",
-      "candid": "canister/api/can.did",
+      "candid": "rs/canister/api/can.did",
       "gzip": true
     }
   },

diff --git a/canister/CHANGELOG.md → rs/canister/CHANGELOG.md b/canister/CHANGELOG.md → rs/canister/CHANGELOG.md
diff --git a/canister/api/Cargo.toml → rs/canister/api/Cargo.toml b/canister/api/Cargo.toml → rs/canister/api/Cargo.toml
diff --git a/canister/api/can.did → rs/canister/api/can.did b/canister/api/can.did → rs/canister/api/can.did
diff --git a/canister/api/src/lib.rs → rs/canister/api/src/lib.rs b/canister/api/src/lib.rs → rs/canister/api/src/lib.rs
diff --git a/...ster/api/src/lifecycle/init_or_upgrade.rs → ...ster/api/src/lifecycle/init_or_upgrade.rs b/...ster/api/src/lifecycle/init_or_upgrade.rs → ...ster/api/src/lifecycle/init_or_upgrade.rs
diff --git a/canister/api/src/lifecycle/mod.rs → rs/canister/api/src/lifecycle/mod.rs b/canister/api/src/lifecycle/mod.rs → rs/canister/api/src/lifecycle/mod.rs
diff --git a/canister/api/src/queries/get_delegation.rs → ...anister/api/src/queries/get_delegation.rs b/canister/api/src/queries/get_delegation.rs → ...anister/api/src/queries/get_delegation.rs
diff --git a/canister/api/src/queries/mod.rs → rs/canister/api/src/queries/mod.rs b/canister/api/src/queries/mod.rs → rs/canister/api/src/queries/mod.rs
diff --git a/...er/api/src/updates/generate_magic_link.rs → ...er/api/src/updates/generate_magic_link.rs b/...er/api/src/updates/generate_magic_link.rs → ...er/api/src/updates/generate_magic_link.rs
diff --git a/canister/api/src/updates/mod.rs → rs/canister/api/src/updates/mod.rs b/canister/api/src/updates/mod.rs → rs/canister/api/src/updates/mod.rs
diff --git a/canister/impl/Cargo.toml → rs/canister/impl/Cargo.toml b/canister/impl/Cargo.toml → rs/canister/impl/Cargo.toml
diff --git a/canister/impl/src/email_sender.rs → rs/canister/impl/src/email_sender.rs b/canister/impl/src/email_sender.rs → rs/canister/impl/src/email_sender.rs
diff --git a/canister/impl/src/env.rs → rs/canister/impl/src/env.rs b/canister/impl/src/env.rs → rs/canister/impl/src/env.rs
diff --git a/canister/impl/src/guards.rs → rs/canister/impl/src/guards.rs b/canister/impl/src/guards.rs → rs/canister/impl/src/guards.rs
diff --git a/canister/impl/src/lib.rs → rs/canister/impl/src/lib.rs b/canister/impl/src/lib.rs → rs/canister/impl/src/lib.rs
diff --git a/canister/impl/src/lifecycle/init.rs → rs/canister/impl/src/lifecycle/init.rs b/canister/impl/src/lifecycle/init.rs → rs/canister/impl/src/lifecycle/init.rs
diff --git a/canister/impl/src/lifecycle/mod.rs → rs/canister/impl/src/lifecycle/mod.rs b/canister/impl/src/lifecycle/mod.rs → rs/canister/impl/src/lifecycle/mod.rs
diff --git a/canister/impl/src/lifecycle/post_upgrade.rs → ...nister/impl/src/lifecycle/post_upgrade.rs b/canister/impl/src/lifecycle/post_upgrade.rs → ...nister/impl/src/lifecycle/post_upgrade.rs
diff --git a/canister/impl/src/lifecycle/pre_upgrade.rs → ...anister/impl/src/lifecycle/pre_upgrade.rs b/canister/impl/src/lifecycle/pre_upgrade.rs → ...anister/impl/src/lifecycle/pre_upgrade.rs
diff --git a/canister/impl/src/memory.rs → rs/canister/impl/src/memory.rs b/canister/impl/src/memory.rs → rs/canister/impl/src/memory.rs
diff --git a/canister/impl/src/model/magic_links.rs → rs/canister/impl/src/model/magic_links.rs b/canister/impl/src/model/magic_links.rs → rs/canister/impl/src/model/magic_links.rs
diff --git a/canister/impl/src/model/mod.rs → rs/canister/impl/src/model/mod.rs b/canister/impl/src/model/mod.rs → rs/canister/impl/src/model/mod.rs
diff --git a/canister/impl/src/model/salt.rs → rs/canister/impl/src/model/salt.rs b/canister/impl/src/model/salt.rs → rs/canister/impl/src/model/salt.rs
diff --git a/canister/impl/src/queries/get_delegation.rs → ...nister/impl/src/queries/get_delegation.rs b/canister/impl/src/queries/get_delegation.rs → ...nister/impl/src/queries/get_delegation.rs
diff --git a/canister/impl/src/queries/http_request.rs → rs/canister/impl/src/queries/http_request.rs b/canister/impl/src/queries/http_request.rs → rs/canister/impl/src/queries/http_request.rs
diff --git a/canister/impl/src/queries/mod.rs → rs/canister/impl/src/queries/mod.rs b/canister/impl/src/queries/mod.rs → rs/canister/impl/src/queries/mod.rs
diff --git a/canister/impl/src/queries/rsa_public_key.rs → ...nister/impl/src/queries/rsa_public_key.rs b/canister/impl/src/queries/rsa_public_key.rs → ...nister/impl/src/queries/rsa_public_key.rs
diff --git a/canister/impl/src/rng.rs → rs/canister/impl/src/rng.rs b/canister/impl/src/rng.rs → rs/canister/impl/src/rng.rs
diff --git a/canister/impl/src/state.rs → rs/canister/impl/src/state.rs b/canister/impl/src/state.rs → rs/canister/impl/src/state.rs
diff --git a/...r/impl/src/updates/generate_magic_link.rs → ...r/impl/src/updates/generate_magic_link.rs b/...r/impl/src/updates/generate_magic_link.rs → ...r/impl/src/updates/generate_magic_link.rs
diff --git a/canister/impl/src/updates/mod.rs → rs/canister/impl/src/updates/mod.rs b/canister/impl/src/updates/mod.rs → rs/canister/impl/src/updates/mod.rs
diff --git a/email_sender/aws/Cargo.toml → rs/email_sender/aws/Cargo.toml b/email_sender/aws/Cargo.toml → rs/email_sender/aws/Cargo.toml
diff --git a/email_sender/aws/src/lib.rs → rs/email_sender/aws/src/lib.rs b/email_sender/aws/src/lib.rs → rs/email_sender/aws/src/lib.rs
diff --git a/email_sender/core/Cargo.toml → rs/email_sender/core/Cargo.toml b/email_sender/core/Cargo.toml → rs/email_sender/core/Cargo.toml
diff --git a/email_sender/core/src/lib.rs → rs/email_sender/core/src/lib.rs b/email_sender/core/src/lib.rs → rs/email_sender/core/src/lib.rs
diff --git a/integration_tests/.gitignore → rs/integration_tests/.gitignore b/integration_tests/.gitignore → rs/integration_tests/.gitignore
diff --git a/integration_tests/Cargo.toml → rs/integration_tests/Cargo.toml b/integration_tests/Cargo.toml → rs/integration_tests/Cargo.toml
diff --git a/integration_tests/src/client.rs → rs/integration_tests/src/client.rs b/integration_tests/src/client.rs → rs/integration_tests/src/client.rs
diff --git a/integration_tests/src/identity.rs → rs/integration_tests/src/identity.rs b/integration_tests/src/identity.rs → rs/integration_tests/src/identity.rs
diff --git a/integration_tests/src/lib.rs → rs/integration_tests/src/lib.rs b/integration_tests/src/lib.rs → rs/integration_tests/src/lib.rs
@@ -38,6 +38,8 @@ fn canister_wasm_path() -> PathBuf {
     )
     .parent()
     .unwrap()
+    .parent()
+    .unwrap()
     .join("target")
     .join("wasm32-unknown-unknown")
     .join("release")

diff --git a/integration_tests/src/rng.rs → rs/integration_tests/src/rng.rs b/integration_tests/src/rng.rs → rs/integration_tests/src/rng.rs
diff --git a/integration_tests/src/setup.rs → rs/integration_tests/src/setup.rs b/integration_tests/src/setup.rs → rs/integration_tests/src/setup.rs
diff --git a/integration_tests/src/tests.rs → rs/integration_tests/src/tests.rs b/integration_tests/src/tests.rs → rs/integration_tests/src/tests.rs
diff --git a/libraries/magic_links/Cargo.toml → rs/libraries/magic_links/Cargo.toml b/libraries/magic_links/Cargo.toml → rs/libraries/magic_links/Cargo.toml
diff --git a/libraries/magic_links/src/lib.rs → rs/libraries/magic_links/src/lib.rs b/libraries/magic_links/src/lib.rs → rs/libraries/magic_links/src/lib.rs
diff --git a/libraries/magic_links/src/main.rs → rs/libraries/magic_links/src/main.rs b/libraries/magic_links/src/main.rs → rs/libraries/magic_links/src/main.rs
diff --git a/libraries/test_utils/Cargo.toml → rs/libraries/test_utils/Cargo.toml b/libraries/test_utils/Cargo.toml → rs/libraries/test_utils/Cargo.toml
diff --git a/libraries/test_utils/src/lib.rs → rs/libraries/test_utils/src/lib.rs b/libraries/test_utils/src/lib.rs → rs/libraries/test_utils/src/lib.rs
diff --git a/libraries/utils/Cargo.toml → rs/libraries/utils/Cargo.toml b/libraries/utils/Cargo.toml → rs/libraries/utils/Cargo.toml
diff --git a/libraries/utils/src/hash.rs → rs/libraries/utils/src/hash.rs b/libraries/utils/src/hash.rs → rs/libraries/utils/src/hash.rs
diff --git a/libraries/utils/src/lib.rs → rs/libraries/utils/src/lib.rs b/libraries/utils/src/lib.rs → rs/libraries/utils/src/lib.rs
diff --git a/libraries/utils/src/validated_email.rs → rs/libraries/utils/src/validated_email.rs b/libraries/utils/src/validated_email.rs → rs/libraries/utils/src/validated_email.rs
diff --git a/scripts/run-integration-tests.sh b/scripts/run-integration-tests.sh
@@ -23,12 +23,12 @@ echo "Building canister wasm"
 cargo build --target wasm32-unknown-unknown --release -p sign_in_with_email_canister_impl --locked
 gzip -fk target/wasm32-unknown-unknown/release/sign_in_with_email_canister_impl.wasm
 
-cd integration_tests
+cd rs/integration_tests
 echo "PocketIC download starting"
 curl -Ls https://github.com/dfinity/pocketic/releases/download/${POCKET_IC_SERVER_VERSION}/pocket-ic-x86_64-${PLATFORM}.gz -o pocket-ic.gz || exit 1
 gzip -df pocket-ic.gz
 chmod +x pocket-ic
 echo "PocketIC download completed"
-cd ..
+cd ../..
 
 cargo test --package integration_tests $TESTNAME -- --test-threads $TEST_THREADS