Revert "feat(cdn): comment description assertion until release (#1670)" (#1671)

* Revert "feat(cdn): comment description assertion until release (#1670)"

This reverts commit c004dfb.

* feat: redo import

Author: peterpeterparker

src/console/src/cdn/assert.rs

@@ -1,4 +1,5 @@
 use crate::cdn::constants::{RELEASES_COLLECTION_KEY, RELEASES_COLLECTION_PATH};
+use junobuild_cdn::storage::assert_releases_description;
 use junobuild_cdn::storage::errors::{
     JUNO_CDN_STORAGE_ERROR_INVALID_COLLECTION, JUNO_CDN_STORAGE_ERROR_INVALID_RELEASES_PATH,
 };
@@ -9,14 +10,13 @@ use junobuild_storage::types::state::FullPath;
 
 pub fn assert_cdn_asset_keys(
     full_path: &FullPath,
-    _description: &Option<String>,
+    description: &Option<String>,
     collection: &CollectionKey,
 ) -> Result<(), String> {
     match collection.as_str() {
         RELEASES_COLLECTION_KEY => {
             assert_releases_keys(full_path)?;
-            // TODO: Uncomment for release
-            // assert_releases_description(description)?;
+            assert_releases_description(description)?;
 
             Ok(())
         }

src/tests/specs/satellite/stock/satellite.cdn.spec.ts

@@ -37,9 +37,6 @@ describe('Satellite > Cdn', () => {
 
 	const currentDate = new Date(2021, 6, 10, 0, 0, 0, 0);
 
-	// TODO: Redo 32n for release
-	const EXPECTED_PROPOSALS_BASE_COUNT = 28n;
-
 	beforeAll(async () => {
 		pic = await PocketIc.create(inject('PIC_URL'));
 
@@ -329,7 +326,7 @@ describe('Satellite > Cdn', () => {
 				canisterId: () => canisterId,
 				caller: () => controllerSubmit,
 				pic: () => pic,
-				expected_proposal_id: EXPECTED_PROPOSALS_BASE_COUNT,
+				expected_proposal_id: 32n,
 				fullPaths: {
 					assetsUpgrade: '/magic.html',
 					segmentsDeployment: '/_juno/releases/satellite-v2.1.1.wasm.gz',
@@ -342,7 +339,7 @@ describe('Satellite > Cdn', () => {
 			testCdnGetProposal({
 				actor: () => actor,
 				owner: () => controllerSubmit,
-				proposalId: EXPECTED_PROPOSALS_BASE_COUNT
+				proposalId: 32n
 			});
 
 			testCdnGetProposal({
@@ -362,7 +359,7 @@ describe('Satellite > Cdn', () => {
 					return actor;
 				},
 				owner: () => controllerSubmit,
-				proposalId: EXPECTED_PROPOSALS_BASE_COUNT
+				proposalId: 32n
 			});
 
 			testCdnGetProposal({
@@ -371,7 +368,7 @@ describe('Satellite > Cdn', () => {
 					return actor;
 				},
 				owner: () => controllerSubmit,
-				proposalId: EXPECTED_PROPOSALS_BASE_COUNT
+				proposalId: 32n
 			});
 		});
 
@@ -390,7 +387,7 @@ describe('Satellite > Cdn', () => {
 				canisterId: () => canisterId,
 				caller: () => controllerSubmit,
 				pic: () => pic,
-				expected_proposal_id: EXPECTED_PROPOSALS_BASE_COUNT + 6n,
+				expected_proposal_id: 38n,
 				fullPaths: {
 					assetsUpgrade: '/book.html',
 					segmentsDeployment: '/_juno/releases/satellite-v3.1.1.wasm.gz',
@@ -403,7 +400,7 @@ describe('Satellite > Cdn', () => {
 			testCdnGetProposal({
 				actor: () => actor,
 				owner: () => controllerSubmit,
-				proposalId: EXPECTED_PROPOSALS_BASE_COUNT
+				proposalId: 32n
 			});
 
 			testCdnGetProposal({
@@ -423,7 +420,7 @@ describe('Satellite > Cdn', () => {
 					return actor;
 				},
 				owner: () => controllerSubmit,
-				proposalId: EXPECTED_PROPOSALS_BASE_COUNT
+				proposalId: 32n
 			});
 
 			testCdnGetProposal({
@@ -432,7 +429,7 @@ describe('Satellite > Cdn', () => {
 					return actor;
 				},
 				owner: () => controllerSubmit,
-				proposalId: EXPECTED_PROPOSALS_BASE_COUNT
+				proposalId: 32n
 			});
 		});
 
@@ -442,7 +439,7 @@ describe('Satellite > Cdn', () => {
 			await expect(
 				commit_proposal({
 					sha256: Array.from({ length: 32 }).map((_, i) => i),
-					proposal_id: EXPECTED_PROPOSALS_BASE_COUNT
+					proposal_id: 32n
 				})
 			).rejects.toThrow(JUNO_AUTH_ERROR_NOT_WRITE_CONTROLLER);
 		});
@@ -463,12 +460,12 @@ describe('Satellite > Cdn', () => {
 
 		testCdnListProposals({
 			actor: () => actor,
-			proposalsLength: EXPECTED_PROPOSALS_BASE_COUNT + 11n
+			proposalsLength: 43n
 		});
 
 		testCdnCountProposals({
 			actor: () => actor,
-			proposalsLength: EXPECTED_PROPOSALS_BASE_COUNT + 11n
+			proposalsLength: 43n
 		});
 	});
 });

src/tests/utils/cdn-assertions-tests.utils.ts

@@ -848,8 +848,7 @@ export const testReleasesProposal = ({
 			});
 		});
 
-		// TODO: include for release
-		describe.skip.each(validModuleFullPaths)('Asset requires description', (fullPath) => {
+		describe.each(validModuleFullPaths)('Asset requires description', (fullPath) => {
 			it('should throw error if description is missing', async () => {
 				const { init_proposal_asset_upload, init_proposal } = actor();
 
@@ -1044,12 +1043,9 @@ export const testCdnGetProposal = ({
 	});
 };
 
-// TODO: Redo 25n for release
-const EXPECTED_PROPOSALS_BASE_COUNT = 19n;
-
 export const testCdnCountProposals = ({
 	actor,
-	proposalsLength = EXPECTED_PROPOSALS_BASE_COUNT
+	proposalsLength = 25n
 }: {
 	actor: () => Actor<SatelliteActor | ConsoleActor>;
 	proposalsLength?: bigint;
@@ -1063,7 +1059,7 @@ export const testCdnCountProposals = ({
 
 export const testCdnListProposals = ({
 	actor,
-	proposalsLength = EXPECTED_PROPOSALS_BASE_COUNT
+	proposalsLength = 25n
 }: {
 	actor: () => Actor<SatelliteActor | ConsoleActor>;
 	proposalsLength?: bigint;