Merge branch 'main' into bot-rust-update

Author: peterpeterparker

scripts/observatory.certificate.mjs

@@ -12,7 +12,7 @@ const getGoogleCertificate = async ({ mainnet, provider: cmdProvider }) => {
 		? observatoryActorIC()
 		: observatoryActorLocal());
 
-	const provider = cmdProvider === 'github' ? { GitHub: null } : { Google: null };
+	const provider = cmdProvider === 'github_auth' ? { GitHubAuth: null } : { Google: null };
 
 	const certificate = await get_openid_certificate({ provider });
 
@@ -31,7 +31,7 @@ const mainnet = targetMainnet();
 const args = process.argv.slice(2);
 const provider = nextArg({ args, option: '-p' }) ?? nextArg({ args, option: '--provider' });
 
-if (!['google', 'github'].includes(provider)) {
+if (!['google', 'github_auth'].includes(provider)) {
 	console.log(`Provider ${provider} is not supported`);
 	process.exit(1);
 }

scripts/observatory.monitoring.mjs

@@ -9,7 +9,7 @@ const toggleOpenIdMonitoring = async ({ mainnet, provider, start }) => {
 		? observatoryActorIC()
 		: observatoryActorLocal());
 
-	const args = provider === 'github' ? { GitHub: null } : { Google: null };
+	const args = provider === 'github_auth' ? { GitHubAuth: null } : { Google: null };
 
 	if (start) {
 		await start_openid_monitoring(args);
@@ -39,7 +39,7 @@ if (start === true && stop === true) {
 
 const provider = nextArg({ args, option: '-p' }) ?? nextArg({ args, option: '--provider' });
 
-if (!['google', 'github'].includes(provider)) {
+if (!['google', 'github_auth'].includes(provider)) {
 	console.log(`Provider ${provider} is not supported`);
 	process.exit(1);
 }

src/console/src/factory/orchestrator.rs

@@ -85,6 +85,7 @@ where
     Err("Unknown caller".to_string())
 }
 
+#[allow(clippy::too_many_arguments)]
 pub async fn create_segment_with_account<F, Fut, P, Pay, R, Refund>(
     create: F,
     process_payment: P,
@@ -151,7 +152,7 @@ where
     R: FnOnce(Principal, Fee) -> Refund,
     Refund: Future<Output = Result<BlockIndex, String>>,
 {
-    let refund_block_index = refund_payment(purchaser.clone(), fee).await?;
+    let refund_block_index = refund_payment(*purchaser, fee).await?;
 
     // We record the refund in the payment list
     update_icrc_payment_refunded(payment_key, &refund_block_index)

src/console/src/fees/types.rs

@@ -1,4 +1,5 @@
 pub enum FeeKind {
     Cycles,
+    #[allow(clippy::upper_case_acronyms)]
     ICP,
 }

src/console/src/impls.rs

@@ -132,7 +132,7 @@ impl Segment {
 
         Self {
             segment_id: *segment_id,
-            metadata: metadata.unwrap_or(HashMap::new()),
+            metadata: metadata.unwrap_or_default(),
             created_at: now,
             updated_at: now,
         }

src/console/src/lib.rs

@@ -17,7 +17,6 @@ mod rates;
 mod segments;
 mod store;
 mod types;
-mod upgrade;
 
 use crate::types::interface::AuthenticationArgs;
 use crate::types::interface::AuthenticationResult;

src/console/src/memory/lifecycle.rs

@@ -4,7 +4,6 @@ use crate::fees::init_factory_fees;
 use crate::memory::manager::{get_memory_upgrades, init_stable_state, STATE};
 use crate::rates::init::init_factory_rates;
 use crate::types::state::{HeapState, ReleasesMetadata, State};
-use crate::upgrade::types::upgrade::UpgradeState;
 use ciborium::{from_reader, into_writer};
 use ic_cdk_macros::{init, post_upgrade, pre_upgrade};
 use junobuild_shared::ic::api::caller;
@@ -51,12 +50,9 @@ fn post_upgrade() {
     let memory = get_memory_upgrades();
     let state_bytes = read_post_upgrade(&memory);
 
-    // TODO: remove once OpenIdProvider migrated on mainnet
-    let upgrade_state: UpgradeState = from_reader(&*state_bytes)
+    let state: State = from_reader(&*state_bytes)
         .expect("Failed to decode the state of the console in post_upgrade hook.");
 
-    let state: State = upgrade_state.into();
-
     STATE.with(|s| *s.borrow_mut() = state);
 
     defer_init_certified_assets();

src/console/src/types.rs

@@ -280,6 +280,7 @@ pub mod ledger {
     #[derive(Clone)]
     pub enum Fee {
         Cycles(CyclesTokens),
+        #[allow(clippy::upper_case_acronyms)]
         ICP(Tokens),
     }
 }