fix integrity check

ZenVoich · Oct 31, 2023 · 3c03931 · 3c03931
1 parent 562a8fc
commit 3c03931
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/backend/main/main-canister.mo b/backend/main/main-canister.mo
@@ -590,6 +590,7 @@ actor {
 		for (fileId in publicFileIds.vals()) {
 			let ?hasher = publishingFileHashers.get(fileId) else return #err("Hasher not found");
 			hashByFileId.put(fileId, hasher.sum());
+			publishingFileHashers.delete(fileId);
 		};
 
 		// finish uploads
@@ -757,7 +758,7 @@ actor {
 				let #ok(fileMeta) = await storage.getFileMeta(fileId) else Debug.trap("File meta '" # fileId # "' not found");
 
 				let hasher = Sha256.Digest(#sha256);
-				for (i in Iter.range(1, fileMeta.chunkCount)) {
+				for (i in Iter.range(0, fileMeta.chunkCount - 1)) {
 					let #ok(chunk) = await storage.downloadChunk(fileId, i) else Debug.trap("File chunk '" # fileId # "' not found");
 					hasher.writeBlob(chunk);
 				};

diff --git a/cli/cli.ts b/cli/cli.ts
@@ -65,7 +65,7 @@ program
 	.option('--dev', 'Remove from dev-dependencies instead of dependencies')
 	.option('--verbose', 'Show more information')
 	.option('--dry-run', 'Do not actually remove anything')
-	.addOption(new Option('--lockfile <lockfile>', 'Lockfile action').choices(['save', 'check', 'ignore']))
+	.addOption(new Option('--lockfile <lockfile>', 'Lockfile action').choices(['save', 'ignore']))
 	.action(async (pkg, options) => {
 		if (!checkConfigFile()) {
 			process.exit(1);

diff --git a/cli/commands/update.ts b/cli/commands/update.ts
@@ -7,7 +7,7 @@ import {checkIntegrity} from '../integrity.js';
 type UpdateOptions = {
 	verbose?: boolean;
 	dev?: boolean;
-	lockfile?: 'save' | 'check' | 'ignore';
+	lockfile?: 'save' | 'ignore';
 };
 
 export async function update(pkg?: string, {lockfile}: UpdateOptions = {}) {

diff --git a/cli/integrity.ts b/cli/integrity.ts
@@ -20,6 +20,7 @@ export async function checkIntegrity(lock?: 'save' | 'check' | 'ignore') {
 
 	if (lock === 'save') {
 		await saveLockFile();
+		await checkLockFile(force);
 	}
 	else if (lock === 'check') {
 		await checkLockFile(force);