Skip to content

Commit 2e3945e

Browse files
committed
Cleanup legacy SingleSignatureStore in aggregator
Which was creating unwanted 'single_signature_legacy' table.
1 parent f96686d commit 2e3945e

File tree

5 files changed

+6
-304
lines changed

5 files changed

+6
-304
lines changed

mithril-aggregator/src/dependency.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ use crate::{
2020
configuration::*, database::provider::StakePoolStore, signable_builder::SignableBuilderService,
2121
signer_registerer::SignerRecorder, ticker_service::TickerService, CertificatePendingStore,
2222
CertificateStore, ProtocolParametersStore, ProtocolParametersStorer, SignerRegisterer,
23-
SignerRegistrationRoundOpener, SingleSignatureStore, Snapshotter, VerificationKeyStore,
24-
VerificationKeyStorer,
23+
SignerRegistrationRoundOpener, Snapshotter, VerificationKeyStore, VerificationKeyStorer,
2524
};
2625
use crate::{event_store::EventMessage, snapshot_stores::SnapshotStore};
2726
use crate::{event_store::TransmitterService, multi_signer::MultiSigner};
@@ -64,9 +63,6 @@ pub struct DependencyManager {
6463
/// Verification key store.
6564
pub verification_key_store: Arc<VerificationKeyStore>,
6665

67-
/// Signer single signature store.
68-
pub single_signature_store: Arc<SingleSignatureStore>,
69-
7066
/// Protocol parameter store.
7167
pub protocol_parameters_store: Arc<ProtocolParametersStore>,
7268

mithril-aggregator/src/dependency_injection/builder.rs

Lines changed: 4 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use std::{collections::HashMap, sync::Arc};
1+
use std::sync::Arc;
22

33
use mithril_common::{
44
api_version::APIVersionProvider,
@@ -11,7 +11,7 @@ use mithril_common::{
1111
CardanoImmutableDigester, DumbImmutableFileObserver, ImmutableDigester,
1212
ImmutableFileObserver, ImmutableFileSystemObserver,
1313
},
14-
entities::{Beacon, CertificatePending, Epoch, PartyId, SingleSignatures},
14+
entities::{CertificatePending, Epoch},
1515
era::{
1616
adapters::{EraReaderAdapterBuilder, EraReaderDummyAdapter},
1717
EraChecker, EraMarker, EraReader, EraReaderAdapter, SupportedEra,
@@ -52,8 +52,8 @@ use crate::{
5252
CertificateStore, Configuration, DependencyManager, DumbSnapshotUploader, DumbSnapshotter,
5353
GzipSnapshotter, LocalSnapshotStore, LocalSnapshotUploader, MithrilSignerRegisterer,
5454
MultiSigner, MultiSignerImpl, ProtocolParametersStore, ProtocolParametersStorer,
55-
RemoteSnapshotUploader, SingleSignatureStore, SnapshotStore, SnapshotUploader,
56-
SnapshotUploaderType, Snapshotter, VerificationKeyStore,
55+
RemoteSnapshotUploader, SnapshotStore, SnapshotUploader, SnapshotUploaderType, Snapshotter,
56+
VerificationKeyStore,
5757
};
5858

5959
use super::{DependenciesBuilderError, Result};
@@ -100,9 +100,6 @@ pub struct DependenciesBuilder {
100100
/// Verification key store.
101101
pub verification_key_store: Option<Arc<VerificationKeyStore>>,
102102

103-
/// Signer single signature store.
104-
pub single_signature_store: Option<Arc<SingleSignatureStore>>,
105-
106103
/// Protocol parameter store.
107104
pub protocol_parameters_store: Option<Arc<ProtocolParametersStore>>,
108105

@@ -192,7 +189,6 @@ impl DependenciesBuilder {
192189
certificate_pending_store: None,
193190
certificate_store: None,
194191
verification_key_store: None,
195-
single_signature_store: None,
196192
protocol_parameters_store: None,
197193
cardano_cli_runner: None,
198194
chain_observer: None,
@@ -434,49 +430,6 @@ impl DependenciesBuilder {
434430
Ok(self.verification_key_store.as_ref().cloned().unwrap())
435431
}
436432

437-
async fn build_single_signature_store(&mut self) -> Result<Arc<SingleSignatureStore>> {
438-
let adapter: Box<
439-
dyn StoreAdapter<Key = Beacon, Record = HashMap<PartyId, SingleSignatures>>,
440-
> = match self.configuration.environment {
441-
ExecutionEnvironment::Production => {
442-
let adapter = SQLiteAdapter::new(
443-
"single_signature_legacy",
444-
self.get_sqlite_connection().await?,
445-
)
446-
.map_err(|e| DependenciesBuilderError::Initialization {
447-
message: "Cannot create SQLite adapter for SingleSignatureStore.".to_string(),
448-
error: Some(e.into()),
449-
})?;
450-
451-
Box::new(adapter)
452-
}
453-
_ => {
454-
let adapter = MemoryAdapter::new(None).map_err(|e| {
455-
DependenciesBuilderError::Initialization {
456-
message: "Cannot create Memory adapter for SingleSignatureStore."
457-
.to_string(),
458-
error: Some(e.into()),
459-
}
460-
})?;
461-
Box::new(adapter)
462-
}
463-
};
464-
465-
Ok(Arc::new(SingleSignatureStore::new(
466-
adapter,
467-
self.configuration.store_retention_limit,
468-
)))
469-
}
470-
471-
/// Get a configured [SingleSignatureStore].
472-
pub async fn get_single_signature_store(&mut self) -> Result<Arc<SingleSignatureStore>> {
473-
if self.single_signature_store.is_none() {
474-
self.single_signature_store = Some(self.build_single_signature_store().await?);
475-
}
476-
477-
Ok(self.single_signature_store.as_ref().cloned().unwrap())
478-
}
479-
480433
async fn build_protocol_parameters_store(&mut self) -> Result<Arc<ProtocolParametersStore>> {
481434
Ok(Arc::new(ProtocolParametersStore::new(
482435
Box::new(EpochSettingStore::new(self.get_sqlite_connection().await?)),
@@ -965,7 +918,6 @@ impl DependenciesBuilder {
965918
certificate_pending_store: self.get_certificate_pending_store().await?,
966919
certificate_store: self.get_certificate_store().await?,
967920
verification_key_store: self.get_verification_key_store().await?,
968-
single_signature_store: self.get_single_signature_store().await?,
969921
protocol_parameters_store: self.get_protocol_parameters_store().await?,
970922
chain_observer: self.get_chain_observer().await?,
971923
beacon_provider: self.get_beacon_provider().await?,

mithril-aggregator/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ pub use snapshot_uploaders::{
5757
pub use snapshotter::{DumbSnapshotter, GzipSnapshotter, SnapshotError, Snapshotter};
5858
pub use store::{
5959
CertificatePendingStore, CertificateStore, ProtocolParametersStore, ProtocolParametersStorer,
60-
SingleSignatureStore, VerificationKeyStore, VerificationKeyStorer,
60+
VerificationKeyStore, VerificationKeyStorer,
6161
};
6262

6363
#[cfg(test)]
Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
mod certificate_store;
22
mod pending_certificate_store;
33
mod protocol_parameters_store;
4-
mod single_signature_store;
54
mod verification_key_store;
65

76
pub use certificate_store::CertificateStore;
87
pub use pending_certificate_store::CertificatePendingStore;
98
pub use protocol_parameters_store::{ProtocolParametersStore, ProtocolParametersStorer};
10-
pub use single_signature_store::{SingleSignatureStore, SingleSignatureStorer};
119
pub use verification_key_store::{VerificationKeyStore, VerificationKeyStorer};

mithril-aggregator/src/store/single_signature_store.rs

Lines changed: 0 additions & 244 deletions
This file was deleted.

0 commit comments

Comments
 (0)