Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Correct the paths for the computation of the RPC API hash and WIT API hash #2142

Merged
merged 4 commits into from
Jun 18, 2024
Merged

Correct the paths for the computation of the RPC API hash and WIT API hash #2142

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eca7534
Correct the paths for the opbention of get_hash.
MathieuDutSik Jun 17, 2024
691e2d4
Add the check that the hash are different.
MathieuDutSik Jun 17, 2024
0fa5752
Change the file used for the hash computation.
MathieuDutSik Jun 17, 2024
854cbdc
Add the check for the get_hash that the number of files is non-zero.
MathieuDutSik Jun 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions linera-version/src/version_info/type.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,14 +103,17 @@ fn get_hash(

let package_glob = format!("{}/{}", package_root.display(), glob);

let mut n_file = 0;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

file_count

for path in glob::glob(&package_glob)? {
let path = path?;
let mut file = std::fs::File::open(&path)?;
relevant_paths.push(path);
n_file += 1;
while file.read(&mut buffer)? != 0 {
hasher.update(buffer);
}
}
assert!(n_file > 0);

Ok(STANDARD_NO_PAD.encode(hasher.finalize()))
}
Expand Down Expand Up @@ -191,8 +194,13 @@ impl VersionInfo {
}
.into();

let rpc_hash =
get_hash(paths, &metadata, "linera-rpc", "tests/staged/formats.yaml")?.into();
let rpc_hash = get_hash(
paths,
&metadata,
"linera-rpc",
"tests/snapshots/format__format.yaml.snap",
)?
.into();

let graphql_hash = get_hash(
paths,
Expand All @@ -202,7 +210,8 @@ impl VersionInfo {
)?
.into();

let wit_hash = get_hash(paths, &metadata, "linera-sdk", "*.wit")?.into();
let wit_hash = get_hash(paths, &metadata, "linera-sdk", "wit/*.wit")?.into();
assert_ne!(rpc_hash, wit_hash);

Ok(Self {
crate_version,
Expand Down
Loading