Skip to content

Commit d7db8b6

Browse files
l-monningerl-monninger
authored
chore: cleanup executor API
Executor API cleanup and simplification
2 parents febcd52 + dbc1f9e commit d7db8b6

File tree

8 files changed

+81
-84
lines changed

8 files changed

+81
-84
lines changed

‎networks/monza/monza-full-node/src/partial.rs

+14-12
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,18 @@ impl <T : MonzaExecutor + Send + Sync + Clone>MonzaPartialNode<T> {
4141
}
4242
}
4343

44-
pub async fn bind_transaction_channel(&mut self) -> Result<(), anyhow::Error> {
45-
self.executor.set_tx_channel(self.transaction_sender.clone()).await?;
46-
Ok(())
47-
}
48-
49-
pub async fn bound(executor : T, light_node_client: LightNodeServiceClient<tonic::transport::Channel>) -> Result<Self, anyhow::Error> {
50-
let mut node = Self::new(executor, light_node_client);
51-
node.bind_transaction_channel().await?;
52-
Ok(node)
53-
}
44+
fn bind_transaction_channel(&mut self) {
45+
self.executor.set_tx_channel(self.transaction_sender.clone());
46+
}
47+
48+
pub fn bound(
49+
executor: T,
50+
light_node_client: LightNodeServiceClient<tonic::transport::Channel>,
51+
) -> Result<Self, anyhow::Error> {
52+
let mut node = Self::new(executor, light_node_client);
53+
node.bind_transaction_channel();
54+
Ok(node)
55+
}
5456

5557
pub async fn tick_write_transactions_to_da(&self) -> Result<(), anyhow::Error> {
5658

@@ -166,7 +168,7 @@ impl <T : MonzaExecutor + Send + Sync + Clone>MonzaPartialNode<T> {
166168
);
167169
let block_id = executable_block.block_id;
168170
self.executor.execute_block(
169-
&FinalityMode::Opt,
171+
FinalityMode::Opt,
170172
executable_block
171173
).await?;
172174

@@ -225,7 +227,7 @@ impl MonzaPartialNode<MonzaExecutorV1> {
225227
let executor = MonzaExecutorV1::try_from_env(tx).await.context(
226228
"Failed to get executor from environment"
227229
)?;
228-
Self::bound(executor, light_node_client).await
230+
Self::bound(executor, light_node_client)
229231
}
230232

231233
}

‎networks/suzuka/suzuka-full-node/src/partial.rs

+14-12
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,18 @@ impl <T : SuzukaExecutor + Send + Sync + Clone>SuzukaPartialNode<T> {
4141
}
4242
}
4343

44-
pub async fn bind_transaction_channel(&mut self) -> Result<(), anyhow::Error> {
45-
self.executor.set_tx_channel(self.transaction_sender.clone()).await?;
46-
Ok(())
47-
}
48-
49-
pub async fn bound(executor : T, light_node_client: LightNodeServiceClient<tonic::transport::Channel>) -> Result<Self, anyhow::Error> {
50-
let mut node = Self::new(executor, light_node_client);
51-
node.bind_transaction_channel().await?;
52-
Ok(node)
53-
}
44+
fn bind_transaction_channel(&mut self) {
45+
self.executor.set_tx_channel(self.transaction_sender.clone());
46+
}
47+
48+
pub fn bound(
49+
executor: T,
50+
light_node_client: LightNodeServiceClient<tonic::transport::Channel>,
51+
) -> Result<Self, anyhow::Error> {
52+
let mut node = Self::new(executor, light_node_client);
53+
node.bind_transaction_channel();
54+
Ok(node)
55+
}
5456

5557
pub async fn tick_write_transactions_to_da(&self) -> Result<(), anyhow::Error> {
5658

@@ -166,7 +168,7 @@ impl <T : SuzukaExecutor + Send + Sync + Clone>SuzukaPartialNode<T> {
166168
);
167169
let block_id = executable_block.block_id;
168170
self.executor.execute_block(
169-
&FinalityMode::Opt,
171+
FinalityMode::Opt,
170172
executable_block
171173
).await?;
172174

@@ -225,7 +227,7 @@ impl SuzukaPartialNode<SuzukaExecutorV1> {
225227
let executor = SuzukaExecutorV1::try_from_env(tx).await.context(
226228
"Failed to get executor from environment"
227229
)?;
228-
Self::bound(executor, light_node_client).await
230+
Self::bound(executor, light_node_client)
229231
}
230232

231233
}

‎protocol-units/execution/maptos/opt-executor/src/executor.rs

+8-11
Original file line numberDiff line numberDiff line change
@@ -292,13 +292,12 @@ impl Executor {
292292
Ok(())
293293
}
294294

295-
pub async fn try_get_context(&self) -> Result<Arc<Context>, anyhow::Error> {
296-
Ok(self.context.clone())
295+
fn context(&self) -> Arc<Context> {
296+
self.context.clone()
297297
}
298298

299-
pub async fn try_get_apis(&self) -> Result<Apis, anyhow::Error> {
300-
let context = self.try_get_context().await?;
301-
Ok(get_apis(context))
299+
pub fn get_apis(&self) -> Apis {
300+
get_apis(self.context())
302301
}
303302

304303
pub async fn run_service(&self) -> Result<(), anyhow::Error> {
@@ -313,9 +312,7 @@ impl Executor {
313312

314313
}
315314

316-
317-
let context = self.try_get_context().await?;
318-
let api_service = get_api_service(context).server(
315+
let api_service = get_api_service(self.context()).server(
319316
format!("http://{:?}", self.aptos_config.aptos_rest_listen_url)
320317
);
321318

@@ -650,7 +647,7 @@ mod tests {
650647
executor.execute_block(block).await?;
651648

652649
// Retrieve the executor's API interface and fetch the transaction by each hash.
653-
let apis = executor.try_get_apis().await?;
650+
let apis = executor.get_apis();
654651
for hash in transaction_hashes {
655652
let _ = apis.transactions.get_transaction_by_hash_inner(
656653
&AcceptType::Bcs,
@@ -743,7 +740,7 @@ mod tests {
743740
Ok(()) as Result<(), anyhow::Error>
744741
});
745742

746-
let api = executor.try_get_apis().await?;
743+
let api = executor.get_apis();
747744
let user_transaction = create_signed_transaction(0, executor.aptos_config.chain_id.clone());
748745
let comparison_user_transaction = user_transaction.clone();
749746
let bcs_user_transaction = bcs::to_bytes(&user_transaction)?;
@@ -774,7 +771,7 @@ mod tests {
774771
Ok(()) as Result<(), anyhow::Error>
775772
});
776773

777-
let api = executor.try_get_apis().await?;
774+
let api = executor.get_apis();
778775
let mut user_transactions = BTreeSet::new();
779776
let mut comparison_user_transactions = BTreeSet::new();
780777
for _ in 0..25 {

‎protocol-units/execution/maptos/util/src/finality_mode.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#[derive(Debug, Clone, PartialEq, Eq)]
1+
#[derive(Debug, Copy, Clone, PartialEq, Eq)]
22
pub enum FinalityMode {
33
Dyn,
44
Opt,

‎protocol-units/execution/monza/executor/src/lib.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,18 @@ pub trait MonzaExecutor {
2424
/// Executes a block dynamically
2525
async fn execute_block(
2626
&self,
27-
mode : &FinalityMode,
27+
mode: FinalityMode,
2828
block: ExecutableBlock,
2929
) -> Result<(), anyhow::Error>;
3030

31-
/// Sets the transaction channel.
32-
async fn set_tx_channel(&mut self, tx_channel: Sender<SignedTransaction>) -> Result<(), anyhow::Error>;
31+
/// Sets the transaction channel.
32+
fn set_tx_channel(
33+
&mut self,
34+
tx_channel: Sender<SignedTransaction>,
35+
);
3336

34-
/// Gets the dyn API.
35-
async fn get_api(
36-
&self,
37-
mode : &FinalityMode,
38-
) -> Result<Apis, anyhow::Error>;
37+
/// Gets the dyn API.
38+
fn get_api(&self, mode: FinalityMode) -> Apis;
3939

4040
/// Get block head height.
4141
async fn get_block_head_height(&self) -> Result<u64, anyhow::Error>;

‎protocol-units/execution/monza/executor/src/v1.rs

+15-16
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ impl MonzaExecutor for MonzaExecutorV1 {
4343
/// Executes a block dynamically
4444
async fn execute_block(
4545
&self,
46-
mode: &FinalityMode,
46+
mode: FinalityMode,
4747
block: ExecutableBlock,
4848
) -> Result<(), anyhow::Error> {
4949
match mode {
@@ -57,19 +57,18 @@ impl MonzaExecutor for MonzaExecutorV1 {
5757
}
5858

5959
/// Sets the transaction channel.
60-
async fn set_tx_channel(
60+
fn set_tx_channel(
6161
&mut self,
6262
tx_channel: Sender<SignedTransaction>,
63-
) -> Result<(), anyhow::Error> {
63+
) {
6464
self.transaction_channel = tx_channel;
65-
Ok(())
6665
}
6766

6867
/// Gets the API.
69-
async fn get_api(&self, _mode: &FinalityMode) -> Result<Apis, anyhow::Error> {
70-
match _mode {
68+
fn get_api(&self, mode: FinalityMode) -> Apis {
69+
match mode {
7170
FinalityMode::Dyn => unimplemented!(),
72-
FinalityMode::Opt => Ok(self.executor.try_get_apis().await?),
71+
FinalityMode::Opt => self.executor.get_apis(),
7372
FinalityMode::Fin => unimplemented!(),
7473
}
7574
}
@@ -131,15 +130,15 @@ mod tests {
131130

132131
#[tokio::test]
133132
async fn test_execute_opt_block() -> Result<(), anyhow::Error> {
134-
let (tx, rx) = async_channel::unbounded();
135-
let mut executor = MonzaExecutorV1::try_from_env(tx).await?;
133+
let (tx, _rx) = async_channel::unbounded();
134+
let executor = MonzaExecutorV1::try_from_env(tx).await?;
136135
let block_id = HashValue::random();
137136
let tx = SignatureVerifiedTransaction::Valid(Transaction::UserTransaction(
138137
create_signed_transaction(0),
139138
));
140139
let txs = ExecutableTransactions::Unsharded(vec![tx]);
141140
let block = ExecutableBlock::new(block_id.clone(), txs);
142-
executor.execute_block(&FinalityMode::Opt, block).await?;
141+
executor.execute_block(FinalityMode::Opt, block).await?;
143142
Ok(())
144143
}
145144

@@ -166,7 +165,7 @@ mod tests {
166165
let bcs_user_transaction = bcs::to_bytes(&user_transaction)?;
167166

168167
let request = SubmitTransactionPost::Bcs(aptos_api::bcs_payload::Bcs(bcs_user_transaction));
169-
let api = executor.get_api(&FinalityMode::Opt).await?;
168+
let api = executor.get_api(FinalityMode::Opt);
170169
api.transactions.submit_transaction(AcceptType::Bcs, request).await?;
171170

172171
services_handle.abort();
@@ -200,7 +199,7 @@ mod tests {
200199
let bcs_user_transaction = bcs::to_bytes(&user_transaction)?;
201200

202201
let request = SubmitTransactionPost::Bcs(aptos_api::bcs_payload::Bcs(bcs_user_transaction));
203-
let api = executor.get_api(&FinalityMode::Opt).await?;
202+
let api = executor.get_api(FinalityMode::Opt);
204203
api.transactions.submit_transaction(AcceptType::Bcs, request).await?;
205204

206205
let received_transaction = rx.recv().await?;
@@ -212,7 +211,7 @@ mod tests {
212211
SignatureVerifiedTransaction::Valid(Transaction::UserTransaction(received_transaction));
213212
let txs = ExecutableTransactions::Unsharded(vec![tx]);
214213
let block = ExecutableBlock::new(block_id.clone(), txs);
215-
executor.execute_block(&FinalityMode::Opt, block).await?;
214+
executor.execute_block(FinalityMode::Opt, block).await?;
216215

217216
services_handle.abort();
218217
background_handle.abort();
@@ -261,7 +260,7 @@ mod tests {
261260

262261
let request =
263262
SubmitTransactionPost::Bcs(aptos_api::bcs_payload::Bcs(bcs_user_transaction));
264-
let api = executor.get_api(&FinalityMode::Opt).await?;
263+
let api = executor.get_api(FinalityMode::Opt);
265264
api.transactions.submit_transaction(AcceptType::Bcs, request).await?;
266265

267266
let received_transaction = rx.recv().await?;
@@ -274,7 +273,7 @@ mod tests {
274273
));
275274
let txs = ExecutableTransactions::Unsharded(vec![tx]);
276275
let block = ExecutableBlock::new(block_id.clone(), txs);
277-
executor.execute_block(&FinalityMode::Opt, block).await?;
276+
executor.execute_block(FinalityMode::Opt, block).await?;
278277

279278
blockheight += 1;
280279
committed_blocks.insert(
@@ -369,7 +368,7 @@ mod tests {
369368
executor.execute_block(block).await?;
370369

371370
// Retrieve the executor's API interface and fetch the transaction by each hash.
372-
let apis = executor.try_get_apis().await?;
371+
let apis = executor.get_apis();
373372
for hash in transaction_hashes {
374373
let _ = apis
375374
.transactions

‎protocol-units/execution/suzuka/executor/src/lib.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,18 @@ pub trait SuzukaExecutor {
2424
/// Executes a block dynamically
2525
async fn execute_block(
2626
&self,
27-
mode : &FinalityMode,
27+
mode: FinalityMode,
2828
block: ExecutableBlock,
2929
) -> Result<(), anyhow::Error>;
3030

31-
/// Sets the transaction channel.
32-
async fn set_tx_channel(&mut self, tx_channel: Sender<SignedTransaction>) -> Result<(), anyhow::Error>;
31+
/// Sets the transaction channel.
32+
fn set_tx_channel(
33+
&mut self,
34+
tx_channel: Sender<SignedTransaction>,
35+
);
3336

34-
/// Gets the dyn API.
35-
async fn get_api(
36-
&self,
37-
mode : &FinalityMode,
38-
) -> Result<Apis, anyhow::Error>;
37+
/// Gets the dyn API.
38+
fn get_api(&self, mode: FinalityMode) -> Apis;
3939

4040
/// Get block head height.
4141
async fn get_block_head_height(&self) -> Result<u64, anyhow::Error>;

0 commit comments

Comments
 (0)