chore: cleaning

Author: MrWad3r

src/models/account_enums.rs

@@ -85,36 +85,15 @@ pub struct Account {
     pub base64url: Address,
 }
 
-impl Account {
-    pub fn from_wc_and_address(workchain_id: i32, address: String) -> Self {
-        let account = format!("{workchain_id}:{address}");
-        let base64url = match StdAddr::from_str(&account) {
-            Ok(account) => Address(account.display_base64_url(true).to_string()),
-            Err(error) => {
-                tracing::error!(
-                    workchain_id,
-                    address,
-                    ?error,
-                    "failed to format account as base64url"
-                );
-                Address(account)
-            }
-        };
-
-        Self {
-            workchain_id,
-            hex: Address(address),
-            base64url,
-        }
-    }
-}
-
 impl From<AddressDb> for Account {
     fn from(a: AddressDb) -> Self {
+        let account = StdAddr::from_str(&format!("{}:{}", a.workchain_id, a.hex)).unwrap();
+        let base64url = Address(account.display_base64_url(true).to_string());
+
         Self {
             workchain_id: a.workchain_id,
             hex: Address(a.hex),
-            base64url: Address(a.base64url),
+            base64url,
         }
     }
 }

src/sqlx_client/last_key_blocks.rs

@@ -5,10 +5,12 @@ use crate::sqlx_client::*;
 
 impl SqlxClient {
     pub async fn create_last_key_block(&self, block_id: &str) -> Result<()> {
-        sqlx::query(r#"INSERT INTO last_key_blocks (block_id) VALUES ($1) ON CONFLICT DO NOTHING"#)
-            .bind(block_id)
-            .execute(&self.pool)
-            .await?;
+        sqlx::query!(
+            r#"INSERT INTO last_key_blocks (block_id) VALUES ($1)"#,
+            block_id
+        )
+        .execute(&self.pool)
+        .await?;
 
         Ok(())
     }

src/utils/token_wallet.rs

@@ -44,9 +44,8 @@ pub fn prepare_token_transfer(
         TokenWalletVersion::Tip3 => {
             use crate::utils::token_wallets;
             let function = token_wallets::transfer();
-            let amount = to_uint128(&tokens, "amount")?;
             let tokens = [
-                AbiValue::uint(128, amount).named("amount"),
+                AbiValue::uint(128, tokens.to_u128().unwrap()).named("amount"),
                 AbiValue::address(destination).named("recipient"),
                 AbiValue::uint(128, INITIAL_BALANCE).named("deployWalletValue"),
                 AbiValue::address(send_gas_to).named("remainingGasTo"),
@@ -87,9 +86,8 @@ pub fn prepare_token_burn(
             use crate::utils::token_wallets;
 
             let function = token_wallets::burnable::burn();
-            let amount = to_uint128(&tokens, "amount")?;
             let tokens = [
-                AbiValue::uint(128, amount).named("amount"),
+                AbiValue::uint(128, tokens.to_u128().unwrap()).named("amount"),
                 AbiValue::address(send_gas_to).named("remainingGasTo"),
                 AbiValue::address(callback_to).named("callbackTo"),
                 AbiValue::Cell(payload).named("payload"),
@@ -127,12 +125,11 @@ pub fn prepare_token_mint(
         TokenWalletVersion::Tip3 => {
             use crate::utils::token_wallets;
             let function = token_wallets::mint();
-            let amount = to_uint128(&tokens, "amount")?;
-            let deploy_wallet_value = to_uint128(&deploy_wallet_value, "deployWalletValue")?;
             let tokens = [
-                AbiValue::uint(128, amount).named("amount"),
+                AbiValue::uint(128, tokens.to_u128().unwrap()).named("amount"),
                 AbiValue::address(recipient).named("recipient"),
-                AbiValue::uint(128, deploy_wallet_value).named("deployWalletValue"),
+                AbiValue::uint(128, deploy_wallet_value.to_u128().unwrap())
+                    .named("deployWalletValue"),
                 AbiValue::address(send_gas_to).named("remainingGasTo"),
                 AbiValue::Bool(notify).named("notify"),
                 AbiValue::Cell(payload).named("payload"),
@@ -231,16 +228,8 @@ pub fn get_root_token_version(
     Ok(version)
 }
 
-fn to_uint128(value: &BigUint, field: &'static str) -> Result<u128> {
-    value
-        .to_u128()
-        .ok_or_else(|| TokenWalletError::InvalidUint128(field).into())
-}
-
 #[derive(thiserror::Error, Debug)]
 enum TokenWalletError {
     #[error("not supported OldTip3v4 tokens")]
     NotSupported,
-    #[error("{0} does not fit into uint128")]
-    InvalidUint128(&'static str),
 }