feat(observatory,console): remove one time upgrade for OpenIdProvider.GitHub

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/observatory/src/lib.rs

@@ -11,7 +11,6 @@ mod random;
 mod store;
 mod templates;
 mod types;
-mod upgrade;
 
 use crate::types::interface::GetNotifications;
 use crate::types::interface::NotifyStatus;

src/observatory/src/memory/lifecycle.rs

@@ -3,7 +3,6 @@ use crate::memory::state::STATE;
 use crate::openid::scheduler::defer_restart_monitoring;
 use crate::random::defer_init_random_seed;
 use crate::types::state::{HeapState, 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;
@@ -46,12 +45,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 observatory in post_upgrade hook.");
 
-    let state: State = upgrade_state.into();
-
     STATE.with(|s| *s.borrow_mut() = state);
 
     init_runtime_state();

src/tests/specs/console/upgrade/console.upgrade-v0-4-0.openid-provider.spec.ts

@@ -25,7 +25,6 @@ import { deploySegments } from '../../../utils/console-tests.utils';
 import { tick } from '../../../utils/pic-tests.utils';
 import { updateRateConfigNoLimit } from '../../../utils/rate.tests.utils';
 import {
-	CONSOLE_WASM_PATH,
 	controllersInitArgs,
 	downloadConsole,
 	downloadObservatory
@@ -39,12 +38,14 @@ describe('Console > Upgrade > OpenIdProvider > v0.3.3 -> v0.4.0', () => {
 
 	const controller = Ed25519KeyIdentity.generate();
 
-	const upgradeCurrent = async () => {
+	const upgrade = async () => {
 		await tick(pic);
 
+		const destination = await downloadConsole({ junoVersion: '0.0.67', version: '0.4.0' });
+
 		await pic.upgradeCanister({
 			canisterId,
-			wasm: CONSOLE_WASM_PATH,
+			wasm: destination,
 			sender: controller.getPrincipal()
 		});
 	};
@@ -168,7 +169,7 @@ describe('Console > Upgrade > OpenIdProvider > v0.3.3 -> v0.4.0', () => {
 	});
 
 	it('should migrate heap OpenIdState.certificates to OpenIdProvider.GitHubAuth', async () => {
-		await expect(upgradeCurrent()).resolves.not.toThrowError();
+		await expect(upgrade()).resolves.not.toThrowError();
 	});
 
 	it('should still be configured with GitHub respectively newly OpenIdDelegationProvider.GitHub', async () => {

src/tests/specs/observatory/openid/observatory.openid.upgrade.spec.ts

@@ -15,8 +15,7 @@ import { assertOpenIdHttpsOutcalls } from '../../../utils/observatory-openid-tes
 import { tick } from '../../../utils/pic-tests.utils';
 import { OBSERVATORY_WASM_PATH } from '../../../utils/setup-tests.utils';
 
-// TODO: reactivate once OpenIdProvider migrated on mainnet
-describe.todo('Observatory > OpenId > Upgrade', async () => {
+describe('Observatory > OpenId > Upgrade', async () => {
 	let pic: PocketIc;
 	let actor: Actor<ObservatoryActor>;
 	let observatoryId: Principal;

src/tests/specs/observatory/upgrade/observatory.upgrade-v0-5-0.openid-provider.spec.ts

@@ -16,7 +16,7 @@ import { generateNonce } from '../../../utils/auth-nonce-tests.utils';
 import { makeMockGitHubOpenIdJwt } from '../../../utils/jwt-tests.utils';
 import { assertOpenIdHttpsOutcalls } from '../../../utils/observatory-openid-tests.utils';
 import { tick } from '../../../utils/pic-tests.utils';
-import { downloadObservatory, OBSERVATORY_WASM_PATH } from '../../../utils/setup-tests.utils';
+import { downloadObservatory } from '../../../utils/setup-tests.utils';
 
 describe('Observatory > Upgrade', () => {
 	let pic: PocketIc;
@@ -25,12 +25,14 @@ describe('Observatory > Upgrade', () => {
 
 	const controller = Ed25519KeyIdentity.generate();
 
-	const upgradeCurrent = async () => {
+	const upgrade = async () => {
 		await tick(pic);
 
+		const destination = await downloadObservatory({ junoVersion: '0.0.67', version: '0.5.0' });
+
 		await pic.upgradeCanister({
 			canisterId: observatoryId,
-			wasm: OBSERVATORY_WASM_PATH,
+			wasm: destination,
 			sender: controller.getPrincipal()
 		});
 	};
@@ -80,7 +82,7 @@ describe('Observatory > Upgrade', () => {
 	});
 
 	it('should migrate heap OpenId.certificates and OpenId.Schedulers to OpenIdProvider.GitHubAuth', async () => {
-		await expect(upgradeCurrent()).resolves.not.toThrowError();
+		await expect(upgrade()).resolves.not.toThrowError();
 	});
 
 	it('should still return certificate', async () => {