Skip to content

Commit c3bd6e4

Browse files
committed
refactor: Rename optimize() -> minimize_tx_size()
1 parent aa4b132 commit c3bd6e4

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

magicblock-committor-service/src/tasks/args_task.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ impl BaseTask for ArgsTask {
8484
}
8585
}
8686

87-
fn optimize(
87+
fn minimize_tx_size(
8888
self: Box<Self>,
8989
) -> Result<Box<dyn BaseTask>, Box<dyn BaseTask>> {
9090
match self.task_type {

magicblock-committor-service/src/tasks/buffer_task.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ impl BaseTask for BufferTask {
6969
}
7070

7171
/// No further optimizations
72-
fn optimize(
72+
fn minimize_tx_size(
7373
self: Box<Self>,
7474
) -> Result<Box<dyn BaseTask>, Box<dyn BaseTask>> {
7575
// Since the buffer in BufferTask doesn't contribute to the size of

magicblock-committor-service/src/tasks/mod.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,9 @@ pub trait BaseTask: Send + Sync + DynClone {
6969
/// Gets instruction for task execution
7070
fn instruction(&self, validator: &Pubkey) -> Instruction;
7171

72-
/// Optimizes Task strategy if possible, otherwise returns itself
73-
fn optimize(
72+
/// Optimize for transaction size so that more instructions can be buddled together in a single
73+
/// transaction. Return Ok(new_tx_optimized_task), else Err(self) if task cannot be optimized.
74+
fn minimize_tx_size(
7475
self: Box<Self>,
7576
) -> Result<Box<dyn BaseTask>, Box<dyn BaseTask>>;
7677

magicblock-committor-service/src/tasks/task_strategist.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@ impl TaskStrategist {
5353
persistor: &Option<P>,
5454
) -> TaskStrategistResult<TransactionStrategy> {
5555
// Attempt optimizing tasks themselves(using buffers)
56-
if Self::optimize_strategy(&mut tasks)? <= MAX_ENCODED_TRANSACTION_SIZE
57-
{
56+
if Self::minimize_tx_size(&mut tasks)? <= MAX_ENCODED_TRANSACTION_SIZE {
5857
// Persist tasks strategy
5958
if let Some(persistor) = persistor {
6059
let mut persistor_visitor = PersistorVisitor {
@@ -152,7 +151,7 @@ impl TaskStrategist {
152151

153152
/// Optimizes set of [`TaskDeliveryStrategy`] to fit [`MAX_ENCODED_TRANSACTION_SIZE`]
154153
/// Returns size of tx after optimizations
155-
fn optimize_strategy(
154+
fn minimize_tx_size(
156155
tasks: &mut [Box<dyn BaseTask>],
157156
) -> Result<usize, SignerError> {
158157
// Get initial transaction size
@@ -207,7 +206,7 @@ impl TaskStrategist {
207206
let tmp_task = Box::new(tmp_task) as Box<dyn BaseTask>;
208207
std::mem::replace(&mut tasks[index], tmp_task)
209208
};
210-
match task.optimize() {
209+
match task.minimize_tx_size() {
211210
// If we can decrease:
212211
// 1. Calculate new tx size & ix size
213212
// 2. Insert item's data back in the heap
@@ -456,7 +455,7 @@ mod tests {
456455
Box::new(create_test_commit_task(3, 1000)) as Box<dyn BaseTask>, // Larger task
457456
];
458457

459-
let _ = TaskStrategist::optimize_strategy(&mut tasks);
458+
let _ = TaskStrategist::minimize_tx_size(&mut tasks);
460459
// The larger task should have been optimized first
461460
assert!(matches!(tasks[0].strategy(), TaskStrategy::Args));
462461
assert!(matches!(tasks[1].strategy(), TaskStrategy::Buffer));

0 commit comments

Comments
 (0)