fix config filtering

near · Apr 17, 2024 · b01c5b5 · b01c5b5
1 parent 0baca04
commit b01c5b5
Showing 1 changed file with 34 additions and 22 deletions.
diff --git a/runtime/runtime/src/prefetch.rs b/runtime/runtime/src/prefetch.rs
@@ -154,22 +154,34 @@ impl TriePrefetcher {
                     }
                 }
 
-                if self.prefetch_api.claim_sweat_prefetch_config.iter().any(|cfg| {
-                    cfg.sender == receipt.predecessor_id.as_str()
-                        && cfg.receiver == account_id.as_str()
-                        && cfg.method_name == fn_call.method_name
-                }) {
-                    match &*fn_call.method_name {
-                        "record_batch_for_hold" => self
-                            .prefetch_claim_sweat_record_batch_for_hold(
-                                account_id.clone(),
-                                &fn_call.args,
-                            )?,
-                        "claim" => self.prefetch_claim_sweat_claim(
+                let claim_sweat_cfg = &self.prefetch_api.claim_sweat_prefetch_config;
+                if fn_call.method_name == "record_batch_for_hold" {
+                    'skip: {
+                        let Some(_cfg) = claim_sweat_cfg.iter().find(|cfg| {
+                            cfg.receiver == account_id.as_str()
+                                && cfg.method_name == fn_call.method_name
+                                && cfg.sender == receipt.predecessor_id.as_str()
+                        }) else {
+                            break 'skip;
+                        };
+                        self.prefetch_claim_sweat_record_batch_for_hold(
+                            account_id.clone(),
+                            &fn_call.args,
+                        )?
+                    }
+                }
+                if fn_call.method_name == "claim" {
+                    'skip: {
+                        let Some(_cfg) = claim_sweat_cfg.iter().find(|cfg| {
+                            cfg.receiver == account_id.as_str()
+                                && cfg.method_name == fn_call.method_name
+                        }) else {
+                            break 'skip;
+                        };
+                        self.prefetch_claim_sweat_claim(
                             account_id.clone(),
                             receipt.predecessor_id.clone(),
-                        )?,
-                        _ => {}
+                        )?
                     }
                 }
 
@@ -367,18 +379,18 @@ impl TriePrefetcher {
                 let Ok(()) = 1u8.serialize(&mut accruals_key) else { continue };
                 let Ok(()) = dt.serialize(&mut accruals_key) else { continue };
                 let accruals_key = sha2::Sha256::digest(&accruals_key).to_vec();
-                let _ = prefetch_api.prefetch_trie_key(trie_root, TrieKey::ContractData {
-                    account_id: account_id.clone(),
-                    key: accruals_key,
-                });
+                let _ = prefetch_api.prefetch_trie_key(
+                    trie_root,
+                    TrieKey::ContractData { account_id: account_id.clone(), key: accruals_key },
+                );
                 let mut amount_key = Vec::with_capacity(4 + 8 + 8);
                 let Ok(()) = 2u8.serialize(&mut amount_key) else { continue };
                 let Ok(()) = dt.serialize(&mut amount_key) else { continue };
                 amount_key.extend(&idx.to_le_bytes()); // index into Vector
-                let _ = prefetch_api.prefetch_trie_key(trie_root, TrieKey::ContractData {
-                    account_id: account_id.clone(),
-                    key: amount_key,
-                });
+                let _ = prefetch_api.prefetch_trie_key(
+                    trie_root,
+                    TrieKey::ContractData { account_id: account_id.clone(), key: amount_key },
+                );
             }
         });
         Ok(())