From 110ef1aa880aa666c2445368b04b552ddb288c9d Mon Sep 17 00:00:00 2001 From: FabijanC Date: Thu, 12 Oct 2023 15:06:00 +0200 Subject: [PATCH] Remove some TODOs and trigger CI (#201) --- crates/starknet-server/src/cli.rs | 2 +- crates/starknet/src/starknet/mod.rs | 3 --- .../rpc/contract_class/deprecated/json_contract_class.rs | 9 --------- .../transactions/broadcasted_declare_transaction_v1.rs | 1 - 4 files changed, 1 insertion(+), 14 deletions(-) diff --git a/crates/starknet-server/src/cli.rs b/crates/starknet-server/src/cli.rs index aa29bfb83..548046e7c 100644 --- a/crates/starknet-server/src/cli.rs +++ b/crates/starknet-server/src/cli.rs @@ -102,7 +102,7 @@ impl Args { .try_into() .expect("Invalid value for initial balance"), // TODO: Doesn't exit nicely. host: self.host.inner, - port: self.port, // TODO: Unification of parsing messages for host and port. + port: self.port, timeout: self.timeout, gas_price: self.gas_price, chain_id: match self.chain_id.as_str() { diff --git a/crates/starknet/src/starknet/mod.rs b/crates/starknet/src/starknet/mod.rs index 1df042074..39d646046 100644 --- a/crates/starknet/src/starknet/mod.rs +++ b/crates/starknet/src/starknet/mod.rs @@ -333,7 +333,6 @@ impl Starknet { Ok(()) } - // TODO: rewrite using our BlockId. fn get_state_at(&self, block_id: &BlockId) -> DevnetResult<&StarknetState> { match block_id { BlockId::Tag(_) => Ok(&self.state), @@ -411,8 +410,6 @@ impl Starknet { Ok(res.execution.retdata.0.into_iter().map(Felt::from).collect()) } - // TODO: move to estimate_fee file - /// Returns just the gas usage, not the overall fee pub fn estimate_fee( &self, block_id: BlockId, diff --git a/crates/types/src/rpc/contract_class/deprecated/json_contract_class.rs b/crates/types/src/rpc/contract_class/deprecated/json_contract_class.rs index 916b88074..63f026198 100644 --- a/crates/types/src/rpc/contract_class/deprecated/json_contract_class.rs +++ b/crates/types/src/rpc/contract_class/deprecated/json_contract_class.rs @@ -240,15 +240,6 @@ impl TryFrom for blockifier::execution::contract_class::ContractClas } } -// TODO: figure out if needed -// pub fn raw_program_into_json(program: &[u8]) -> DevnetResult { -// let decoder = flate2::read::GzDecoder::new(program); -// let starknet_program: LegacyProgram = -// serde_json::from_reader(decoder).map_err(JsonError::SerdeJsonError)?; -// -// Ok(serde_json::to_value(starknet_program).map_err(JsonError::SerdeJsonError)?) -// } - pub fn json_into_raw_program(json_data: &Value) -> DevnetResult> { let mut buffer = Vec::new(); let encoder = GzEncoder::new(&mut buffer, Compression::default()); diff --git a/crates/types/src/rpc/transactions/broadcasted_declare_transaction_v1.rs b/crates/types/src/rpc/transactions/broadcasted_declare_transaction_v1.rs index 1c4f35162..0bd480425 100644 --- a/crates/types/src/rpc/transactions/broadcasted_declare_transaction_v1.rs +++ b/crates/types/src/rpc/transactions/broadcasted_declare_transaction_v1.rs @@ -98,7 +98,6 @@ impl BroadcastedDeclareTransactionV1 { ) -> DevnetResult { let additional_data: Vec = vec![self.common.nonce.into()]; let calldata = vec![class_hash.into()]; - // TODO: Remove when SirDeclare::new will give same hash Ok(calculate_transaction_hash_common( SirTransactionHashPrefix::Declare, self.common.version.into(),