Merge branch 'develop' into tooling-dashboard/style-activity-homepage

.github/workflows/_vercel_deploy.yml

@@ -36,63 +36,63 @@ jobs:
   explorer-preview:
     name: Vercel Explorer Preview
     if: inputs.shouldDeployPreview && inputs.isExplorer
-    uses: ./.github/workflows/apps-explorer.deploy.yml
+    uses: ./.github/workflows/apps_explorer_deploy.yml
     secrets: inherit
     with:
       isProd: false
 
   explorer-prod:
     name: Vercel Explorer Production
     if: inputs.isDevelop
-    uses: ./.github/workflows/apps-explorer.deploy.yml
+    uses: ./.github/workflows/apps_explorer_deploy.yml
     secrets: inherit
     with:
       isProd: true
 
   ui-kit-preview:
     name: Vercel UI Kit Preview
     if: inputs.shouldDeployPreview && inputs.isAppsUiKit
-    uses: ./.github/workflows/apps-ui-kit.deploy.yml
+    uses: ./.github/workflows/apps_ui_kit_deploy.yml
     secrets: inherit
     with:
       isProd: false
 
   ui-kit-prod:
     name: Vercel UI Kit Production
     if: inputs.isDevelop
-    uses: ./.github/workflows/apps-ui-kit.deploy.yml
+    uses: ./.github/workflows/apps_ui_kit_deploy.yml
     secrets: inherit
     with:
       isProd: true
 
   wallet-dashboard-preview:
     name: Vercel Wallet Dashboard Preview
     if: inputs.shouldDeployPreview && inputs.isWalletDashboard
-    uses: ./.github/workflows/apps-wallet-dashboard.deploy.yml
+    uses: ./.github/workflows/apps_wallet_dashboard_deploy.yml
     secrets: inherit
     with:
       isProd: false
 
   wallet-dashboard-prod:
     name: Vercel Wallet Dashboard Production
     if: inputs.isDevelop
-    uses: ./.github/workflows/apps-wallet-dashboard.deploy.yml
+    uses: ./.github/workflows/apps_wallet_dashboard_deploy.yml
     secrets: inherit
     with:
       isProd: true
 
   apps-backend-preview:
     name: Vercel apps-backend Preview
     if: inputs.shouldDeployPreview && inputs.isAppsBackend
-    uses: ./.github/workflows/apps-backend.deploy.yml
+    uses: ./.github/workflows/apps_backend_deploy.yml
     secrets: inherit
     with:
       isProd: false
 
   apps-backend-prod:
     name: Vercel apps-backend Production
     if: inputs.isDevelop
-    uses: ./.github/workflows/apps-backend.deploy.yml
+    uses: ./.github/workflows/apps_backend_deploy.yml
     secrets: inherit
     with:
       isProd: true

crates/iota/tests/cli_tests.rs

@@ -26,7 +26,7 @@ use iota::{
     key_identity::{KeyIdentity, get_identity_address},
 };
 use iota_config::{
-    Config, IOTA_CLIENT_CONFIG, IOTA_FULLNODE_CONFIG, IOTA_GENESIS_FILENAME,
+    IOTA_CLIENT_CONFIG, IOTA_FULLNODE_CONFIG, IOTA_GENESIS_FILENAME,
     IOTA_KEYSTORE_ALIASES_FILENAME, IOTA_KEYSTORE_FILENAME, IOTA_NETWORK_CONFIG, PersistedConfig,
 };
 use iota_json::IotaJsonValue;
@@ -4144,15 +4144,7 @@ async fn test_faucet() -> Result<(), anyhow::Error> {
 
     // Wait for the faucet to be up
     sleep(Duration::from_secs(1)).await;
-
-    let wallet_config = tmp.path().join("walletconfig");
-    let mut keystore = iota_keys::keystore::FileBasedKeystore::new(&tmp.path().join("keystore"))?;
-    keystore
-        .generate_and_add_new_key(SignatureScheme::ED25519, None, None, None)
-        .unwrap();
-    let mut client_config = IotaClientConfig::new(keystore.into());
-    client_config.add_env(iota_sdk::iota_client_config::IotaEnv::localnet());
-    client_config.save(&wallet_config)?;
+    let wallet_config = test_cluster.swarm.dir().join(IOTA_CLIENT_CONFIG);
     let mut context = WalletContext::new(&wallet_config, None, None)?;
 
     let faucet_result = IotaClientCommands::Faucet {