From 14295c5b18e70380f7e6cd66d12ab0a639ab4609 Mon Sep 17 00:00:00 2001 From: rvanasa Date: Wed, 2 Oct 2024 11:54:34 -0600 Subject: [PATCH] Refactor --- e2e/rust/src/main.rs | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/e2e/rust/src/main.rs b/e2e/rust/src/main.rs index 09c2c9b7..e8a15ca7 100644 --- a/e2e/rust/src/main.rs +++ b/e2e/rust/src/main.rs @@ -1,4 +1,4 @@ -use std::{env, str::FromStr}; +use std::str::FromStr; use candid::{candid_method, Principal}; use ic_cdk_macros::update; @@ -11,17 +11,20 @@ use evm_rpc_types::{ fn main() {} #[cfg(target_arch = "wasm32")] -const CANISTER_ID: &str = &env!("CANISTER_ID_EVM_RPC_STAGING"); +const CANISTER_ID: Option<&str> = Some(std::env!( + "CANISTER_ID_EVM_RPC_STAGING", + "Unspecified canister ID environment variable" +)); #[cfg(not(target_arch = "wasm32"))] -const CANISTER_ID: &str = ""; +const CANISTER_ID: Option<&str> = None; #[update] #[candid_method(update)] pub async fn test() { assert!(ic_cdk::api::is_controller(&ic_cdk::caller())); - let canister_id = - Principal::from_str(CANISTER_ID).expect("Error parsing canister ID environment variable"); + let canister_id = Principal::from_str(CANISTER_ID.unwrap()) + .expect("Error parsing canister ID environment variable"); // Define request parameters let params = (