Skip to content

Commit 0055360

Browse files
refactor(mempool_test_utils): add non mut account_with_id, rename previous implementation (#2801)
1 parent 2370fd9 commit 0055360

File tree

3 files changed

+23
-11
lines changed

3 files changed

+23
-11
lines changed

crates/mempool_test_utils/src/starknet_api_test_utils.rs

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ pub fn executable_invoke_tx(cairo_version: CairoVersion) -> AccountTransaction {
119119

120120
let mut tx_generator = MultiAccountTransactionGenerator::new();
121121
tx_generator.register_account(default_account);
122-
tx_generator.account_with_id(0).generate_executable_invoke()
122+
tx_generator.account_with_id_mut(0).generate_executable_invoke()
123123
}
124124

125125
pub fn generate_deploy_account_with_salt(
@@ -162,9 +162,9 @@ type SharedNonceManager = Rc<RefCell<NonceManager>>;
162162
/// tx_generator.register_account_for_flow_test(some_account_type.clone());
163163
/// tx_generator.register_account_for_flow_test(some_account_type);
164164
///
165-
/// let account_0_tx_with_nonce_0 = tx_generator.account_with_id(0).generate_invoke_with_tip(1);
166-
/// let account_1_tx_with_nonce_0 = tx_generator.account_with_id(1).generate_invoke_with_tip(3);
167-
/// let account_0_tx_with_nonce_1 = tx_generator.account_with_id(0).generate_invoke_with_tip(1);
165+
/// let account_0_tx_with_nonce_0 = tx_generator.account_with_id_mut(0).generate_invoke_with_tip(1);
166+
/// let account_1_tx_with_nonce_0 = tx_generator.account_with_id_mut(1).generate_invoke_with_tip(3);
167+
/// let account_0_tx_with_nonce_1 = tx_generator.account_with_id_mut(0).generate_invoke_with_tip(1);
168168
/// ```
169169
// Note: when moving this to starknet api crate, see if blockifier's
170170
// [blockifier::transaction::test_utils::FaultyAccountTxCreatorArgs] can be made to use this.
@@ -194,7 +194,10 @@ impl MultiAccountTransactionGenerator {
194194
default_deploy_account_tx
195195
}
196196

197-
pub fn account_with_id(&mut self, account_id: AccountId) -> &mut AccountTransactionGenerator {
197+
pub fn account_with_id_mut(
198+
&mut self,
199+
account_id: AccountId,
200+
) -> &mut AccountTransactionGenerator {
198201
self.account_tx_generators.get_mut(account_id).unwrap_or_else(|| {
199202
panic!(
200203
"{account_id:?} not found! This number should be an index of an account in the \
@@ -203,6 +206,15 @@ impl MultiAccountTransactionGenerator {
203206
})
204207
}
205208

209+
pub fn account_with_id(&self, account_id: AccountId) -> &AccountTransactionGenerator {
210+
self.account_tx_generators.get(account_id).unwrap_or_else(|| {
211+
panic!(
212+
"{account_id:?} not found! This number should be an index of an account in the \
213+
initialization array. "
214+
)
215+
})
216+
}
217+
206218
// TODO(deploy_account_support): once we support deploy account in tests, remove this method and
207219
// only use new_account_default in tests. In particular, deploy account txs must be then sent to
208220
// the GW via the add tx endpoint just like other txs.
@@ -280,7 +292,7 @@ impl AccountTransactionGenerator {
280292
rpc_invoke_tx(invoke_tx_args)
281293
}
282294

283-
pub fn sender_address(&mut self) -> ContractAddress {
295+
pub fn sender_address(&self) -> ContractAddress {
284296
self.account.sender_address
285297
}
286298

crates/starknet_integration_tests/src/end_to_end_integration.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ async fn await_block(
6565
.ok_or(())
6666
}
6767

68-
pub async fn end_to_end_integration(mut tx_generator: MultiAccountTransactionGenerator) {
68+
pub async fn end_to_end_integration(tx_generator: MultiAccountTransactionGenerator) {
6969
const EXPECTED_BLOCK_NUMBER: BlockNumber = BlockNumber(15);
7070

7171
info!("Checking that the sequencer node executable is present.");

crates/starknet_integration_tests/src/utils.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,11 +177,11 @@ pub fn create_txs_for_integration_test(
177177

178178
// Create RPC transactions.
179179
let account0_invoke_nonce1 =
180-
tx_generator.account_with_id(ACCOUNT_ID_0).generate_invoke_with_tip(2);
180+
tx_generator.account_with_id_mut(ACCOUNT_ID_0).generate_invoke_with_tip(2);
181181
let account0_invoke_nonce2 =
182-
tx_generator.account_with_id(ACCOUNT_ID_0).generate_invoke_with_tip(3);
182+
tx_generator.account_with_id_mut(ACCOUNT_ID_0).generate_invoke_with_tip(3);
183183
let account1_invoke_nonce1 =
184-
tx_generator.account_with_id(ACCOUNT_ID_1).generate_invoke_with_tip(4);
184+
tx_generator.account_with_id_mut(ACCOUNT_ID_1).generate_invoke_with_tip(4);
185185

186186
vec![account0_invoke_nonce1, account0_invoke_nonce2, account1_invoke_nonce1]
187187
}
@@ -192,7 +192,7 @@ fn create_account_txs(
192192
n_txs: usize,
193193
) -> Vec<RpcTransaction> {
194194
(0..n_txs)
195-
.map(|_| tx_generator.account_with_id(account_id).generate_invoke_with_tip(1))
195+
.map(|_| tx_generator.account_with_id_mut(account_id).generate_invoke_with_tip(1))
196196
.collect()
197197
}
198198

0 commit comments

Comments
 (0)