fix

src/canisters/frontend/ic-certified-assets/src/lib.rs

@@ -415,7 +415,9 @@ fn is_controller() -> Result<(), String> {
 
 pub fn init(args: Option<AssetCanisterArgs>) {
     if let Some(upgrade_arg) = args {
-        let AssetCanisterArgs::Init(InitArgs {}) = upgrade_arg else { ic_cdk::trap("Cannot initialize the canister with an Upgrade argument. Please provide an Init argument.")};
+        let AssetCanisterArgs::Init(InitArgs {}) = upgrade_arg else {
+            ic_cdk::trap("Cannot initialize the canister with an Upgrade argument. Please provide an Init argument.")
+        };
     }
     STATE.with(|s| {
         let mut s = s.borrow_mut();

src/canisters/frontend/ic-certified-assets/src/tests.rs

@@ -10,11 +10,10 @@ use crate::types::{
 };
 use crate::url_decode::{url_decode, UrlDecodeError};
 use candid::{Nat, Principal};
+use ic_certification_testing::CertificateBuilder;
 use ic_crypto_tree_hash::Digest;
-use ic_response_verification::ResponseVerificationError;
 use ic_response_verification_test_utils::{
-    base64_encode, create_canister_id, get_current_timestamp, CanisterData, CertificateBuilder,
-    CertificateData,
+    base64_encode, create_canister_id, get_current_timestamp,
 };
 use serde_bytes::ByteBuf;
 use std::collections::HashMap;
@@ -34,21 +33,20 @@ pub fn verify_response(
     state: &State,
     request: &HttpRequest,
     response: &HttpResponse,
-) -> Result<bool, ResponseVerificationError> {
+) -> anyhow::Result<bool> {
     let mut response = response.clone();
     let current_time = get_current_timestamp();
     let canister_id = create_canister_id("rdmx6-jaaaa-aaaaa-aaadq-cai");
     let min_requested_verification_version = request.get_certificate_version();
 
     // inject certificate into IC-Certificate header with 'certificate=::'
-    let (_cert, root_key, cert_cbor) =
-        CertificateBuilder::new(CertificateData::CanisterData(CanisterData {
-            canister_id,
-            certified_data: Digest(state.root_hash()),
-        }))
-        .with_time(current_time)
-        .build();
-    let replacement_cert_value = base64_encode(&cert_cbor);
+    let data = CertificateBuilder::new(
+        &canister_id.to_string(),
+        Digest(state.root_hash()).as_bytes(),
+    )?
+    .with_time(current_time)
+    .build()?;
+    let replacement_cert_value = base64_encode(&data.cbor_encoded_certificate);
     let (_, header_value) = response
         .headers
         .iter_mut()
@@ -60,26 +58,28 @@ pub fn verify_response(
     );
 
     // actual verification
-    let request = ic_response_verification::types::Request {
+    let request = ic_http_certification::http::HttpRequest {
         method: request.method.clone(),
         url: request.url.clone(),
         headers: request.headers.clone(),
+        body: request.body[..].into(),
     };
-    let response = ic_response_verification::types::Response {
+    let response = ic_http_certification::http::HttpResponse {
         status_code: response.status_code,
         headers: response.headers,
         body: response.body[..].into(),
+        upgrade: None,
     };
-    ic_response_verification::verify_request_response_pair(
+    Ok(ic_response_verification::verify_request_response_pair(
         request,
         response,
         canister_id.as_ref(),
         current_time,
         MAX_CERT_TIME_OFFSET_NS,
-        &root_key,
+        &data.root_key,
         min_requested_verification_version.try_into().unwrap(),
     )
-    .map(|res| res.passed)
+    .map(|res| res.response.is_some())?)
 }
 
 fn certified_http_request(state: &State, request: HttpRequest) -> HttpResponse {