Skip to content

Commit a70ba85

Browse files
committed
refactor(aggregator): provide tx signing config as parameter in init_state_from_fixture
This remove the usages of the only configuration field of the dependency container.
1 parent 2fbe826 commit a70ba85

File tree

4 files changed

+29
-11
lines changed

4 files changed

+29
-11
lines changed

mithril-aggregator/src/dependency_injection/containers.rs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -209,17 +209,19 @@ impl DependencyContainer {
209209
///
210210
/// Fill the stores of a [DependencyManager] in a way to simulate an aggregator state
211211
/// using the data from a precomputed fixture.
212-
pub async fn init_state_from_fixture(&self, fixture: &MithrilFixture, target_epochs: &[Epoch]) {
212+
pub async fn init_state_from_fixture(
213+
&self,
214+
fixture: &MithrilFixture,
215+
cardano_transactions_signing_config: &CardanoTransactionsSigningConfig,
216+
target_epochs: &[Epoch],
217+
) {
213218
for epoch in target_epochs {
214219
self.epoch_settings_storer
215220
.save_epoch_settings(
216221
*epoch,
217-
#[allow(deprecated)]
218222
AggregatorEpochSettings {
219223
protocol_parameters: fixture.protocol_parameters(),
220-
cardano_transactions_signing_config: self
221-
.config
222-
.cardano_transactions_signing_config
224+
cardano_transactions_signing_config: cardano_transactions_signing_config
223225
.clone(),
224226
},
225227
)

mithril-aggregator/src/runtime/runner.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,8 @@ pub mod tests {
532532
use async_trait::async_trait;
533533
use chrono::{DateTime, Utc};
534534
use mithril_common::entities::{
535-
ChainPoint, Epoch, SignedEntityConfig, SignedEntityTypeDiscriminants,
535+
CardanoTransactionsSigningConfig, ChainPoint, Epoch, SignedEntityConfig,
536+
SignedEntityTypeDiscriminants,
536537
};
537538
use mithril_common::temp_dir;
538539
use mithril_common::{
@@ -575,6 +576,7 @@ pub mod tests {
575576
.unwrap();
576577
deps.init_state_from_fixture(
577578
&fixture,
579+
&CardanoTransactionsSigningConfig::dummy(),
578580
&[
579581
current_epoch.offset_to_signer_retrieval_epoch().unwrap(),
580582
current_epoch,

mithril-aggregator/src/services/certifier/certifier_service.rs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,6 +439,8 @@ mod tests {
439439
current_epoch: Option<Epoch>,
440440
) -> MithrilCertifierService {
441441
let configuration = Configuration::new_sample(snapshot_directory);
442+
let cardano_transactions_signing_config =
443+
configuration.cardano_transactions_signing_config.clone();
442444
let mut dependency_builder = DependenciesBuilder::new_with_stdout_logger(configuration);
443445
if let Some(epoch) = current_epoch {
444446
dependency_builder.epoch_service = Some(Arc::new(RwLock::new(
@@ -451,7 +453,11 @@ mod tests {
451453
.await
452454
.unwrap();
453455
dependency_manager
454-
.init_state_from_fixture(fixture, epochs_with_signers)
456+
.init_state_from_fixture(
457+
fixture,
458+
&cardano_transactions_signing_config,
459+
epochs_with_signers,
460+
)
455461
.await;
456462

457463
MithrilCertifierService::from_deps(network, dependency_builder).await

mithril-aggregator/tests/test_extensions/runtime_tester.rs

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ use mithril_common::{
1717
crypto_helper::ProtocolGenesisSigner,
1818
digesters::{DumbImmutableDigester, DumbImmutableFileObserver},
1919
entities::{
20-
BlockNumber, Certificate, CertificateSignature, ChainPoint, Epoch, ImmutableFileNumber,
21-
SignedEntityType, SignedEntityTypeDiscriminants, SingleSignatureAuthenticationStatus,
22-
SlotNumber, Snapshot, StakeDistribution, TimePoint,
20+
BlockNumber, CardanoTransactionsSigningConfig, Certificate, CertificateSignature,
21+
ChainPoint, Epoch, ImmutableFileNumber, SignedEntityType, SignedEntityTypeDiscriminants,
22+
SingleSignatureAuthenticationStatus, SlotNumber, Snapshot, StakeDistribution, TimePoint,
2323
},
2424
era::{adapters::EraReaderDummyAdapter, EraMarker, EraReader, SupportedEra},
2525
test_utils::{
@@ -105,6 +105,7 @@ macro_rules! assert_metrics_eq {
105105

106106
pub struct RuntimeTester {
107107
pub network: String,
108+
pub cardano_transactions_signing_config: CardanoTransactionsSigningConfig,
108109
pub snapshot_uploader: Arc<DumbUploader>,
109110
pub chain_observer: Arc<FakeObserver>,
110111
pub immutable_file_observer: Arc<DumbImmutableFileObserver>,
@@ -134,6 +135,8 @@ impl RuntimeTester {
134135
let logger = build_logger();
135136
let global_logger = slog_scope::set_global_logger(logger.clone());
136137
let network = configuration.network.clone();
138+
let cardano_transactions_signing_config =
139+
configuration.cardano_transactions_signing_config.clone();
137140
let snapshot_uploader = Arc::new(DumbUploader::default());
138141
let immutable_file_observer = Arc::new(DumbImmutableFileObserver::new());
139142
immutable_file_observer
@@ -173,6 +176,7 @@ impl RuntimeTester {
173176

174177
Self {
175178
network,
179+
cardano_transactions_signing_config,
176180
snapshot_uploader,
177181
chain_observer,
178182
immutable_file_observer,
@@ -237,7 +241,11 @@ impl RuntimeTester {
237241
// Init the stores needed for a genesis certificate
238242
let genesis_epochs = self.dependencies.get_genesis_epochs().await;
239243
self.dependencies
240-
.init_state_from_fixture(fixture, &[genesis_epochs.0, genesis_epochs.1])
244+
.init_state_from_fixture(
245+
fixture,
246+
&self.cardano_transactions_signing_config,
247+
&[genesis_epochs.0, genesis_epochs.1],
248+
)
241249
.await;
242250
Ok(())
243251
}

0 commit comments

Comments
 (0)