Skip to content

Commit 7c4bd40

Browse files
committed
refactor!: remove archive hash from the public interface and always calculate/verify the has when requesting an archive
1 parent 0af2c85 commit 7c4bd40

File tree

2 files changed

+5
-34
lines changed

2 files changed

+5
-34
lines changed

postgresql_archive/tests/archive.rs

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,11 @@
11
#[allow(deprecated)]
22
use postgresql_archive::{extract, Version, LATEST, V12, V13, V14, V15, V16};
33
use postgresql_archive::{get_archive, get_archive_for_target, get_version};
4-
use sha2::{Digest, Sha256};
54
use std::fs::{create_dir_all, remove_dir_all};
65
use test_log::test;
76

87
async fn test_get_archive_for_version_constant(version: Version) -> anyhow::Result<()> {
9-
let (_, archive, hash) = get_archive(&version).await?;
10-
11-
let mut hasher = Sha256::new();
12-
hasher.update(&archive);
13-
let archive_hash = hex::encode(&hasher.finalize());
14-
15-
assert_eq!(archive_hash, hash);
8+
let (_archive_version, _archive) = get_archive(&version).await?;
169
Ok(())
1710
}
1811

@@ -69,13 +62,8 @@ async fn test_get_version() -> anyhow::Result<()> {
6962
#[test(tokio::test)]
7063
async fn test_get_archive_and_extract() -> anyhow::Result<()> {
7164
let version = &LATEST;
72-
let (archive_version, archive, hash) = get_archive(version).await?;
65+
let (archive_version, archive) = get_archive(version).await?;
7366

74-
let mut hasher = Sha256::new();
75-
hasher.update(&archive);
76-
let archive_hash = hex::encode(&hasher.finalize());
77-
78-
assert_eq!(archive_hash, hash);
7967
assert!(archive_version.matches(version));
8068

8169
let out_dir = tempfile::tempdir()?.path().to_path_buf();
@@ -112,14 +100,9 @@ async fn test_get_archive_for_target_target_not_found() -> postgresql_archive::R
112100
#[test(tokio::test)]
113101
async fn test_get_archive_for_target() -> anyhow::Result<()> {
114102
let version = &LATEST;
115-
let (archive_version, archive, hash) =
103+
let (archive_version, _archive) =
116104
get_archive_for_target(version, target_triple::TARGET).await?;
117105

118-
let mut hasher = Sha256::new();
119-
hasher.update(&archive);
120-
let archive_hash = hex::encode(&hasher.finalize());
121-
122-
assert_eq!(archive_hash, hash);
123106
assert!(archive_version.matches(version));
124107

125108
Ok(())

postgresql_archive/tests/blocking.rs

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ use postgresql_archive::blocking::{extract, get_archive, get_archive_for_target,
33
#[cfg(feature = "blocking")]
44
use postgresql_archive::LATEST;
55
#[cfg(feature = "blocking")]
6-
use sha2::{Digest, Sha256};
7-
#[cfg(feature = "blocking")]
86
use std::fs::{create_dir_all, remove_dir_all};
97
#[cfg(feature = "blocking")]
108
use test_log::test;
@@ -31,13 +29,8 @@ fn test_get_version() -> anyhow::Result<()> {
3129
#[allow(deprecated)]
3230
fn test_get_archive_and_extract() -> anyhow::Result<()> {
3331
let version = &LATEST;
34-
let (archive_version, archive, hash) = get_archive(version)?;
35-
36-
let mut hasher = Sha256::new();
37-
hasher.update(&archive);
38-
let archive_hash = hex::encode(&hasher.finalize());
32+
let (archive_version, archive) = get_archive(version)?;
3933

40-
assert_eq!(archive_hash, hash);
4134
assert!(archive_version.matches(version));
4235

4336
let out_dir = tempfile::tempdir()?.path().to_path_buf();
@@ -53,13 +46,8 @@ fn test_get_archive_and_extract() -> anyhow::Result<()> {
5346
#[allow(deprecated)]
5447
fn test_get_archive_for_target() -> anyhow::Result<()> {
5548
let version = &LATEST;
56-
let (archive_version, archive, hash) = get_archive_for_target(version, target_triple::TARGET)?;
57-
58-
let mut hasher = Sha256::new();
59-
hasher.update(&archive);
60-
let archive_hash = hex::encode(&hasher.finalize());
49+
let (archive_version, _archive) = get_archive_for_target(version, target_triple::TARGET)?;
6150

62-
assert_eq!(archive_hash, hash);
6351
assert!(archive_version.matches(version));
6452

6553
Ok(())

0 commit comments

Comments
 (0)