cleaned up fastcallreadonly

Author: rdeioris

stackslib/src/net/api/callreadonly.rs

@@ -14,12 +14,10 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-use std::time::Duration;
-
 use clarity::vm::analysis::CheckErrors;
 use clarity::vm::ast::parser::v1::CLARITY_NAME_REGEX;
 use clarity::vm::clarity::ClarityConnection;
-use clarity::vm::costs::{CostErrors, ExecutionCost, LimitedCostTracker};
+use clarity::vm::costs::{ExecutionCost, LimitedCostTracker};
 use clarity::vm::errors::Error::Unchecked;
 use clarity::vm::errors::{Error as ClarityRuntimeError, InterpreterError};
 use clarity::vm::representations::{CONTRACT_NAME_REGEX_STRING, STANDARD_PRINCIPAL_REGEX_STRING};
@@ -218,8 +216,6 @@ impl RPCRequestHandler for RPCCallReadOnlyRequestHandler {
                 cost_limit.write_length = 0;
                 cost_limit.write_count = 0;
 
-                let mut enforce_max_execution_time = false;
-
                 chainstate.maybe_read_only_clarity_tx(
                     &sortdb.index_handle_at_block(chainstate, &tip)?,
                     &tip,

stackslib/src/net/api/fastcallreadonly.rs

@@ -19,11 +19,11 @@ use std::time::Duration;
 use clarity::vm::analysis::CheckErrors;
 use clarity::vm::ast::parser::v1::CLARITY_NAME_REGEX;
 use clarity::vm::clarity::ClarityConnection;
-use clarity::vm::costs::{CostErrors, ExecutionCost, LimitedCostTracker};
+use clarity::vm::costs::{ExecutionCost, LimitedCostTracker};
+use clarity::vm::errors::Error as ClarityRuntimeError;
 use clarity::vm::errors::Error::Unchecked;
-use clarity::vm::errors::{Error as ClarityRuntimeError, InterpreterError};
 use clarity::vm::representations::{CONTRACT_NAME_REGEX_STRING, STANDARD_PRINCIPAL_REGEX_STRING};
-use clarity::vm::types::{PrincipalData, QualifiedContractIdentifier};
+use clarity::vm::types::PrincipalData;
 use clarity::vm::{ClarityName, ContractName, SymbolicExpression, Value};
 use regex::{Captures, Regex};
 use stacks_common::types::chainstate::StacksAddress;
@@ -50,15 +50,17 @@ pub struct RPCFastCallReadOnlyRequestHandler {
 }
 
 impl RPCFastCallReadOnlyRequestHandler {
-    pub fn new(
-        maximum_call_argument_size: u32,
-        read_only_call_limit: ExecutionCost,
-        read_only_max_execution_time: Duration,
-    ) -> Self {
+    pub fn new(maximum_call_argument_size: u32, read_only_max_execution_time: Duration) -> Self {
         Self {
             call_read_only_handler: RPCCallReadOnlyRequestHandler::new(
                 maximum_call_argument_size,
-                read_only_call_limit,
+                ExecutionCost {
+                    write_length: 0,
+                    write_count: 0,
+                    read_length: 0,
+                    read_count: 0,
+                    runtime: 0,
+                },
             ),
             read_only_max_execution_time,
         }
@@ -200,14 +202,10 @@ impl RPCRequestHandler for RPCFastCallReadOnlyRequestHandler {
                 let mainnet = chainstate.mainnet;
                 let chain_id = chainstate.chain_id;
 
-                let mut enforce_max_execution_time = false;
-
                 chainstate.maybe_read_only_clarity_tx(
                     &sortdb.index_handle_at_block(chainstate, &tip)?,
                     &tip,
                     |clarity_tx| {
-                        let epoch = clarity_tx.get_epoch();
-
                         let clarity_version = clarity_tx
                             .with_analysis_db_readonly(|analysis_db| {
                                 analysis_db.get_clarity_version(&contract_identifier)

stackslib/src/net/api/mod.rs

@@ -77,7 +77,6 @@ impl StacksHttp {
         ));
         self.register_rpc_endpoint(fastcallreadonly::RPCFastCallReadOnlyRequestHandler::new(
             self.maximum_call_argument_size,
-            self.read_only_call_limit.clone(),
             self.read_only_max_execution_time,
         ));
         self.register_rpc_endpoint(getaccount::RPCGetAccountRequestHandler::new());

stackslib/src/net/api/tests/fastcallreadonly.rs

@@ -59,11 +59,8 @@ fn test_try_parse_request() {
     debug!("Request:\n{}\n", std::str::from_utf8(&bytes).unwrap());
 
     let (parsed_preamble, offset) = http.read_preamble(&bytes).unwrap();
-    let mut handler = fastcallreadonly::RPCFastCallReadOnlyRequestHandler::new(
-        4096,
-        BLOCK_LIMIT_MAINNET_21,
-        Duration::from_secs(30),
-    );
+    let mut handler =
+        fastcallreadonly::RPCFastCallReadOnlyRequestHandler::new(4096, Duration::from_secs(30));
     let mut parsed_request = http
         .handle_try_parse_request(
             &mut handler,