chore: Do not use expect

--- don't change below this line ---
ENG-4063 Took 57 minutes


Took 17 seconds

Took 45 seconds
This commit is contained in:
Diana Carvalho
2025-01-21 10:07:16 +00:00
parent 7890f26812
commit 979cdf7437
6 changed files with 40 additions and 34 deletions

View File

@@ -3,7 +3,10 @@ use std::str::FromStr;
use alloy_primitives::U256;
use tycho_core::Bytes;
use crate::encoding::user_approvals_manager::{Approval, UserApprovalsManager};
use crate::encoding::{
errors::EncodingError,
user_approvals_manager::{Approval, UserApprovalsManager},
};
#[allow(dead_code)]
pub struct Permit2 {
@@ -12,12 +15,13 @@ pub struct Permit2 {
#[allow(dead_code)]
impl Permit2 {
pub fn new() -> Self {
Self {
pub fn new() -> Result<Self, EncodingError> {
Ok(Self {
address: Bytes::from_str("0x000000000022D473030F116dDEE9F6B43aC78BA3")
.expect("Permit2 address not valid"),
}
.map_err(|_| EncodingError::FatalError("Permit2 address not valid".to_string()))?,
})
}
fn get_allowance_data(
&self,
_user: Bytes,

View File

@@ -18,10 +18,11 @@ pub struct ProtocolApprovalsManager {
runtime: Runtime,
}
impl ProtocolApprovalsManager {
pub fn new() -> Self {
let runtime = Runtime::new().expect("Failed to create runtime");
let client = runtime.block_on(get_client());
Self { client, runtime }
pub fn new() -> Result<Self, EncodingError> {
let runtime = Runtime::new()
.map_err(|_| EncodingError::FatalError("Failed to create runtime".to_string()))?;
let client = runtime.block_on(get_client())?;
Ok(Self { client, runtime })
}
pub fn approval_needed(
&self,
@@ -56,14 +57,15 @@ impl ProtocolApprovalsManager {
}
}
pub async fn get_client() -> Arc<RootProvider<BoxTransport>> {
pub async fn get_client() -> Result<Arc<RootProvider<BoxTransport>>, EncodingError> {
dotenv().ok();
let eth_rpc_url = env::var("ETH_RPC_URL").expect("Missing ETH_RPC_URL in environment");
let eth_rpc_url = env::var("ETH_RPC_URL")
.map_err(|_| EncodingError::FatalError("Missing ETH_RPC_URL in environment".to_string()))?;
let client = ProviderBuilder::new()
.on_builtin(&eth_rpc_url)
.await
.expect("Failed to build provider");
Arc::new(client)
.map_err(|_| EncodingError::FatalError("Failed to build provider".to_string()))?;
Ok(Arc::new(client))
}
#[cfg(test)]
@@ -85,7 +87,7 @@ mod tests {
true
)]
fn test_approval_needed(#[case] spender: &str, #[case] owner: &str, #[case] expected: bool) {
let manager = ProtocolApprovalsManager::new();
let manager = ProtocolApprovalsManager::new().unwrap();
let token = Address::from_str("0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48").unwrap();
let spender = Address::from_str(spender).unwrap();