get rid of boxed dyn

Author: VladasZ

contract/src/jar/account/v1.rs

@@ -129,10 +129,8 @@ impl AccountV1 {
     }
 }
 
-type ProductFilter = dyn FnMut(&Product) -> bool;
-
 impl Contract {
-    pub(crate) fn update_account_cache(&mut self, account_id: &AccountId, filter: Option<Box<ProductFilter>>) {
+    pub(crate) fn update_account_cache(&mut self, account_id: &AccountId, filter: Option<fn(&Product) -> bool>) {
         let now = env::block_timestamp_ms();
         let products = self.get_products(account_id, filter);
         let account = self.get_account_mut(account_id);
@@ -148,7 +146,7 @@ impl Contract {
         account.update_jar_cache(product, env::block_timestamp_ms());
     }
 
-    fn get_products(&self, account_id: &AccountId, filter: Option<Box<ProductFilter>>) -> Vec<Product> {
+    fn get_products(&self, account_id: &AccountId, filter: Option<impl Fn(&Product) -> bool>) -> Vec<Product> {
         let products = self
             .get_account(account_id)
             .jars

contract/src/score/score_api.rs

@@ -25,9 +25,7 @@ impl ScoreApi for Contract {
         for (account_id, new_score) in batch {
             self.update_account_cache(
                 &account_id,
-                Some(Box::new(|product: &Product| {
-                    matches!(product.terms, Terms::ScoreBased(_))
-                })),
+                Some(|product: &Product| matches!(product.terms, Terms::ScoreBased(_))),
             );
 
             let account = self.get_account_mut(&account_id);