Skip to content

Commit 2b38b12

Browse files
tharinduamila-instatharinduamila-insta
committed
remove helper function
1 parent fe9cfb5 commit 2b38b12

File tree

6 files changed

+86
-63
lines changed

6 files changed

+86
-63
lines changed

‎shotover-proxy/benches/windsock/cassandra/bench.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@ impl CassandraBench {
455455
hard_connection_limit: None,
456456
tls: None,
457457
timeout: None,
458-
chain: TransformChainConfig::new_unnamed(transforms),
458+
chain: TransformChainConfig { transforms },
459459
transport: None,
460460
},
461461
))

‎shotover-proxy/benches/windsock/kafka/bench.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ impl KafkaBench {
126126
hard_connection_limit: None,
127127
tls: None,
128128
timeout: None,
129-
chain: TransformChainConfig::new_unnamed(transforms),
129+
chain: TransformChainConfig { transforms },
130130
},
131131
))
132132
}

‎shotover-proxy/benches/windsock/valkey/bench.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ impl ValkeyBench {
146146
hard_connection_limit: None,
147147
tls: tls_acceptor,
148148
timeout: None,
149-
chain: TransformChainConfig::new_unnamed(transforms),
149+
chain: TransformChainConfig { transforms },
150150
},
151151
))
152152
}

‎shotover/src/config/chain.rs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@ pub struct TransformChainConfig {
2020
}
2121

2222
impl TransformChainConfig {
23-
pub fn new_unnamed(transforms: Vec<NamedTransformEntry>) -> Self {
24-
TransformChainConfig { transforms }
25-
}
26-
2723
pub async fn get_builder(
2824
&self,
2925
mut transform_context: TransformContextConfig,

‎shotover/src/config/topology.rs‎

Lines changed: 53 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ mod topology_tests {
146146
hard_connection_limit: None,
147147
tls: None,
148148
timeout: None,
149-
chain: TransformChainConfig::new_unnamed(transforms),
149+
chain: TransformChainConfig { transforms },
150150
})]
151151
}
152152

@@ -160,7 +160,7 @@ mod topology_tests {
160160
hard_connection_limit: None,
161161
tls: None,
162162
timeout: None,
163-
chain: TransformChainConfig::new_unnamed(transforms),
163+
chain: TransformChainConfig { transforms },
164164
transport: None,
165165
})]
166166
}
@@ -321,11 +321,13 @@ foo source:
321321
named(
322322
"cache",
323323
Box::new(ValkeyCacheConfig {
324-
chain: TransformChainConfig::new_unnamed(vec![
325-
named("c-debug-1", Box::new(DebugPrinterConfig)),
326-
named("c-debug-2", Box::new(DebugPrinterConfig)),
327-
named("c-sink", Box::new(NullSinkConfig)),
328-
]),
324+
chain: TransformChainConfig {
325+
transforms: vec![
326+
named("c-debug-1", Box::new(DebugPrinterConfig)),
327+
named("c-debug-2", Box::new(DebugPrinterConfig)),
328+
named("c-sink", Box::new(NullSinkConfig)),
329+
],
330+
},
329331
caching_schema,
330332
}),
331333
),
@@ -351,12 +353,14 @@ foo source:
351353
named(
352354
"cache",
353355
Box::new(ValkeyCacheConfig {
354-
chain: TransformChainConfig::new_unnamed(vec![
355-
named("c-debug", Box::new(DebugPrinterConfig)),
356-
named("c-sink-1", Box::new(NullSinkConfig)),
357-
named("c-debug-2", Box::new(DebugPrinterConfig)),
358-
named("c-sink-2", Box::new(NullSinkConfig)),
359-
]),
356+
chain: TransformChainConfig {
357+
transforms: vec![
358+
named("c-debug", Box::new(DebugPrinterConfig)),
359+
named("c-sink-1", Box::new(NullSinkConfig)),
360+
named("c-debug-2", Box::new(DebugPrinterConfig)),
361+
named("c-sink-2", Box::new(NullSinkConfig)),
362+
],
363+
},
360364
caching_schema: HashMap::new(),
361365
}),
362366
),
@@ -378,11 +382,13 @@ foo source:
378382
"pmap",
379383
Box::new(ParallelMapConfig {
380384
parallelism: 1,
381-
chain: TransformChainConfig::new_unnamed(vec![
382-
named("p-debug-1", Box::new(DebugPrinterConfig)),
383-
named("p-debug-2", Box::new(DebugPrinterConfig)),
384-
named("p-sink", Box::new(NullSinkConfig)),
385-
]),
385+
chain: TransformChainConfig {
386+
transforms: vec![
387+
named("p-debug-1", Box::new(DebugPrinterConfig)),
388+
named("p-debug-2", Box::new(DebugPrinterConfig)),
389+
named("p-sink", Box::new(NullSinkConfig)),
390+
],
391+
},
386392
ordered_results: false,
387393
}),
388394
),
@@ -408,12 +414,14 @@ foo source:
408414
"pmap",
409415
Box::new(ParallelMapConfig {
410416
parallelism: 1,
411-
chain: TransformChainConfig::new_unnamed(vec![
412-
named("p-debug", Box::new(DebugPrinterConfig)),
413-
named("p-sink-1", Box::new(NullSinkConfig)),
414-
named("p-debug-2", Box::new(DebugPrinterConfig)),
415-
named("p-sink-2", Box::new(NullSinkConfig)),
416-
]),
417+
chain: TransformChainConfig {
418+
transforms: vec![
419+
named("p-debug", Box::new(DebugPrinterConfig)),
420+
named("p-sink-1", Box::new(NullSinkConfig)),
421+
named("p-debug-2", Box::new(DebugPrinterConfig)),
422+
named("p-sink-2", Box::new(NullSinkConfig)),
423+
],
424+
},
417425
ordered_results: false,
418426
}),
419427
),
@@ -435,12 +443,14 @@ foo source:
435443
Terminating transform "p-sink-1" is not last in chain. Terminating transform must be last in chain.
436444
"#;
437445

438-
let subchain = TransformChainConfig::new_unnamed(vec![
439-
named("p-debug", Box::new(DebugPrinterConfig)),
440-
named("p-sink-1", Box::new(NullSinkConfig)),
441-
named("p-debug-2", Box::new(DebugPrinterConfig)),
442-
named("p-sink-2", Box::new(NullSinkConfig)),
443-
]);
446+
let subchain = TransformChainConfig {
447+
transforms: vec![
448+
named("p-debug", Box::new(DebugPrinterConfig)),
449+
named("p-sink-1", Box::new(NullSinkConfig)),
450+
named("p-debug-2", Box::new(DebugPrinterConfig)),
451+
named("p-sink-2", Box::new(NullSinkConfig)),
452+
],
453+
};
444454

445455
let error = run_test_topology_valkey(vec![
446456
named("debug-1", Box::new(DebugPrinterConfig)),
@@ -471,10 +481,12 @@ foo source:
471481
Non-terminating transform "p-debug-2" is last in chain. Last transform must be terminating.
472482
"#;
473483

474-
let subchain = TransformChainConfig::new_unnamed(vec![
475-
named("p-debug-1", Box::new(DebugPrinterConfig)),
476-
named("p-debug-2", Box::new(DebugPrinterConfig)),
477-
]);
484+
let subchain = TransformChainConfig {
485+
transforms: vec![
486+
named("p-debug-1", Box::new(DebugPrinterConfig)),
487+
named("p-debug-2", Box::new(DebugPrinterConfig)),
488+
],
489+
};
478490

479491
let error = run_test_topology_valkey(vec![
480492
named("debug-1", Box::new(DebugPrinterConfig)),
@@ -506,11 +518,13 @@ foo source:
506518
Non-terminating transform "p-debug-2" is last in chain. Last transform must be terminating.
507519
"#;
508520

509-
let subchain = TransformChainConfig::new_unnamed(vec![
510-
named("p-debug-1", Box::new(DebugPrinterConfig)),
511-
named("p-sink", Box::new(NullSinkConfig)),
512-
named("p-debug-2", Box::new(DebugPrinterConfig)),
513-
]);
521+
let subchain = TransformChainConfig {
522+
transforms: vec![
523+
named("p-debug-1", Box::new(DebugPrinterConfig)),
524+
named("p-sink", Box::new(NullSinkConfig)),
525+
named("p-debug-2", Box::new(DebugPrinterConfig)),
526+
],
527+
};
514528

515529
let error = run_test_topology_valkey(vec![
516530
named("debug-1", Box::new(DebugPrinterConfig)),

‎shotover/src/transforms/tee.rs‎

Lines changed: 30 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -633,7 +633,9 @@ mod tests {
633633
let config = TeeConfig {
634634
behavior: None,
635635
timeout_micros: None,
636-
chain: TransformChainConfig::new_unnamed(vec![named("sink", Box::new(NullSinkConfig))]),
636+
chain: TransformChainConfig {
637+
transforms: vec![named("sink", Box::new(NullSinkConfig))],
638+
},
637639
buffer_size: None,
638640
switch_port: None,
639641
};
@@ -653,10 +655,12 @@ mod tests {
653655
let config = TeeConfig {
654656
behavior: None,
655657
timeout_micros: None,
656-
chain: TransformChainConfig::new_unnamed(vec![
657-
named("sink-1", Box::new(NullSinkConfig)),
658-
named("sink-2", Box::new(NullSinkConfig)),
659-
]),
658+
chain: TransformChainConfig {
659+
transforms: vec![
660+
named("sink-1", Box::new(NullSinkConfig)),
661+
named("sink-2", Box::new(NullSinkConfig)),
662+
],
663+
},
660664
buffer_size: None,
661665
switch_port: None,
662666
};
@@ -679,7 +683,9 @@ mod tests {
679683
let config = TeeConfig {
680684
behavior: Some(ConsistencyBehaviorConfig::Ignore),
681685
timeout_micros: None,
682-
chain: TransformChainConfig::new_unnamed(vec![named("sink", Box::new(NullSinkConfig))]),
686+
chain: TransformChainConfig {
687+
transforms: vec![named("sink", Box::new(NullSinkConfig))],
688+
},
683689
buffer_size: None,
684690
switch_port: None,
685691
};
@@ -698,7 +704,9 @@ mod tests {
698704
let config = TeeConfig {
699705
behavior: Some(ConsistencyBehaviorConfig::FailOnMismatch),
700706
timeout_micros: None,
701-
chain: TransformChainConfig::new_unnamed(vec![named("sink", Box::new(NullSinkConfig))]),
707+
chain: TransformChainConfig {
708+
transforms: vec![named("sink", Box::new(NullSinkConfig))],
709+
},
702710
buffer_size: None,
703711
switch_port: None,
704712
};
@@ -717,13 +725,17 @@ mod tests {
717725
let config = TeeConfig {
718726
behavior: Some(ConsistencyBehaviorConfig::SubchainOnMismatch {
719727
name: "mismatch_chain".to_string(),
720-
chain: TransformChainConfig::new_unnamed(vec![
721-
named("sink-1", Box::new(NullSinkConfig)),
722-
named("sink-2", Box::new(NullSinkConfig)),
723-
]),
728+
chain: TransformChainConfig {
729+
transforms: vec![
730+
named("sink-1", Box::new(NullSinkConfig)),
731+
named("sink-2", Box::new(NullSinkConfig)),
732+
],
733+
},
724734
}),
725735
timeout_micros: None,
726-
chain: TransformChainConfig::new_unnamed(vec![named("sink", Box::new(NullSinkConfig))]),
736+
chain: TransformChainConfig {
737+
transforms: vec![named("sink", Box::new(NullSinkConfig))],
738+
},
727739
buffer_size: None,
728740
switch_port: None,
729741
};
@@ -746,13 +758,14 @@ mod tests {
746758
let config = TeeConfig {
747759
behavior: Some(ConsistencyBehaviorConfig::SubchainOnMismatch {
748760
name: "mismatch_chain".to_string(),
749-
chain: TransformChainConfig::new_unnamed(vec![named(
750-
"sink",
751-
Box::new(NullSinkConfig),
752-
)]),
761+
chain: TransformChainConfig {
762+
transforms: vec![named("sink", Box::new(NullSinkConfig))],
763+
},
753764
}),
754765
timeout_micros: None,
755-
chain: TransformChainConfig::new_unnamed(vec![named("sink", Box::new(NullSinkConfig))]),
766+
chain: TransformChainConfig {
767+
transforms: vec![named("sink", Box::new(NullSinkConfig))],
768+
},
756769
buffer_size: None,
757770
switch_port: None,
758771
};

0 commit comments

Comments
 (0)