cleanup

Author: alexytsu

fil_token/src/token/mod.rs

@@ -9,7 +9,6 @@ use fvm_shared::bigint::bigint_ser::BigIntDe;
 use fvm_shared::bigint::BigInt;
 use fvm_shared::bigint::Zero;
 use fvm_shared::econ::TokenAmount;
-use fvm_shared::ActorID;
 
 use self::errors::ActorError;
 use self::state::TokenState;
@@ -83,15 +82,7 @@ where
     /// Injected blockstore
     bs: BS,
     /// Access to the runtime
-    fvm: FVM,
-}
-
-/// Resolve an address to an ActorID
-fn resolve_address(address: &Address) -> Result<ActorID> {
-    match fvm_sdk::actor::resolve_address(address) {
-        Some(addr) => Ok(addr),
-        None => Err(ActorError::AddrNotFound(*address)),
-    }
+    _fvm: FVM,
 }
 
 impl<BS, FVM> StandardToken<BS, FVM>
@@ -114,7 +105,7 @@ where
         init_state.save(&self.bs);
 
         let mint_params = params.mint_params;
-        self.mint(mint_params);
+        self.mint(mint_params)?;
         Ok(())
     }
 
@@ -230,7 +221,7 @@ where
             },
             // No allowance recorded previously
             None => {
-                caller_allowances_map.set(spender, BigIntDe(params.value.clone()));
+                caller_allowances_map.set(spender, BigIntDe(params.value.clone()))?;
                 params.value
             }
         };
@@ -263,7 +254,7 @@ where
                     .checked_sub(&params.value)
                     .unwrap() // Unwrap should be safe as allowance always > 0
                     .max(BigInt::zero());
-                caller_allowances_map.set(spender, BigIntDe(new_allowance.clone()));
+                caller_allowances_map.set(spender, BigIntDe(new_allowance.clone()))?;
                 new_allowance
             }
             None => {
@@ -298,7 +289,7 @@ where
         };
 
         let new_allowance = TokenAmount::zero();
-        caller_allowances_map.set(spender, BigIntDe(new_allowance.clone()));
+        caller_allowances_map.set(spender, BigIntDe(new_allowance.clone()))?;
         state.save(&self.bs);
 
         Ok(AllowanceReturn {
@@ -336,11 +327,11 @@ where
         })
     }
 
-    fn burn(&self, params: BurnParams) -> Result<BurnReturn> {
+    fn burn(&self, _params: BurnParams) -> Result<BurnReturn> {
         todo!()
     }
 
-    fn transfer_from(&self, params: TransferParams) -> Result<TransferReturn> {
+    fn transfer_from(&self, _params: TransferParams) -> Result<TransferReturn> {
         todo!()
     }
 }

fil_token/src/token/state.rs

@@ -1,6 +1,3 @@
-use std::ops::Add;
-use std::ops::Sub;
-
 use anyhow::anyhow;
 use cid::multihash::Code;
 use cid::Cid;
@@ -16,13 +13,10 @@ use fvm_sdk::sself;
 use fvm_shared::address::Address;
 use fvm_shared::bigint::bigint_ser;
 use fvm_shared::bigint::bigint_ser::BigIntDe;
-use fvm_shared::bigint::Zero;
 use fvm_shared::econ::TokenAmount;
 use fvm_shared::ActorID;
 use fvm_shared::HAMT_BIT_WIDTH;
 
-use crate::blockstore::Blockstore;
-
 /// A macro to abort concisely.
 macro_rules! abort {
     ($code:ident, $msg:literal $(, $ex:expr)*) => {
@@ -259,8 +253,6 @@ pub struct TokenAmountDiff {
     pub actual: TokenAmount,
 }
 
-type TransferResult<T> = std::result::Result<T, TransferError>;
-
 pub enum TransferError {
     NoRecrHook,
     InsufficientAllowance(TokenAmountDiff),