Skip to content

Commit f775ec4

Browse files
committed
refactor(signer): remove signer_ prefix as is implicit in the context of the node
1 parent 0ed8881 commit f775ec4

File tree

6 files changed

+20
-22
lines changed

6 files changed

+20
-22
lines changed

mithril-signer/src/entities/signer_epoch_settings.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ pub struct SignerEpochSettings {
88
/// Current Epoch
99
pub epoch: Epoch,
1010

11-
/// Signer registration protocol parameters
12-
pub signer_registration_protocol_parameters: ProtocolParameters,
11+
/// Registration protocol parameters
12+
pub registration_protocol_parameters: ProtocolParameters,
1313

1414
/// Current Signers
1515
pub current_signers: Vec<Signer>,
@@ -33,8 +33,8 @@ impl SignerEpochSettings {
3333
// Beacon
3434
let beacon = fake_data::beacon();
3535

36-
// Signer registration protocol parameters
37-
let signer_registration_protocol_parameters = fake_data::protocol_parameters();
36+
// Registration protocol parameters
37+
let registration_protocol_parameters = fake_data::protocol_parameters();
3838

3939
// Signers
4040
let signers = fake_data::signers(5);
@@ -49,7 +49,7 @@ impl SignerEpochSettings {
4949
// Signer Epoch settings
5050
SignerEpochSettings {
5151
epoch: beacon.epoch,
52-
signer_registration_protocol_parameters,
52+
registration_protocol_parameters,
5353
current_signers,
5454
next_signers,
5555
cardano_transactions_signing_config,

mithril-signer/src/message_adapters/from_epoch_settings.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ impl TryFromMessageAdapter<EpochSettingsMessage, SignerEpochSettings> for FromEp
1515
#[allow(deprecated)]
1616
let epoch_settings = SignerEpochSettings {
1717
epoch: message.epoch,
18-
signer_registration_protocol_parameters: message
19-
.signer_registration_protocol_parameters,
18+
registration_protocol_parameters: message.signer_registration_protocol_parameters,
2019
current_signers: SignerMessagePart::try_into_signers(message.current_signers)
2120
.with_context(|| "'FromMessageAdapter' can not convert the current signers")?,
2221
next_signers: SignerMessagePart::try_into_signers(message.next_signers)

mithril-signer/src/runtime/runner.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ impl Runner for SignerRunner {
138138
let (epoch, protocol_parameters) = {
139139
let epoch_service = self.services.epoch_service.read().await;
140140
let epoch = epoch_service.epoch_of_current_data()?;
141-
let protocol_parameters = epoch_service.signer_registration_protocol_parameters()?;
141+
let protocol_parameters = epoch_service.registration_protocol_parameters()?;
142142

143143
(epoch, protocol_parameters.clone())
144144
};

mithril-signer/src/runtime/state_machine.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ mod tests {
510510
let mut runner = MockSignerRunner::new();
511511
let epoch_settings = SignerEpochSettings {
512512
epoch: Epoch(3),
513-
signer_registration_protocol_parameters: fake_data::protocol_parameters(),
513+
registration_protocol_parameters: fake_data::protocol_parameters(),
514514
current_signers: vec![],
515515
next_signers: vec![],
516516
cardano_transactions_signing_config: None,

mithril-signer/src/services/epoch_service.rs

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ pub trait EpochService: Sync + Send {
4242
/// Get the current epoch for which the data stored in this service are computed.
4343
fn epoch_of_current_data(&self) -> StdResult<Epoch>;
4444

45-
/// Get protocol parameters for signer registration.
46-
fn signer_registration_protocol_parameters(&self) -> StdResult<&ProtocolParameters>;
45+
/// Get protocol parameters for registration.
46+
fn registration_protocol_parameters(&self) -> StdResult<&ProtocolParameters>;
4747

4848
/// Get the protocol initializer for the current epoch if any
4949
///
@@ -81,7 +81,7 @@ pub trait EpochService: Sync + Send {
8181

8282
pub(crate) struct EpochData {
8383
pub epoch: Epoch,
84-
pub signer_registration_protocol_parameters: ProtocolParameters,
84+
pub registration_protocol_parameters: ProtocolParameters,
8585
pub protocol_initializer: Option<ProtocolInitializer>,
8686
pub current_signers: Vec<Signer>,
8787
pub next_signers: Vec<Signer>,
@@ -190,8 +190,7 @@ impl EpochService for MithrilEpochService {
190190

191191
self.epoch_data = Some(EpochData {
192192
epoch,
193-
signer_registration_protocol_parameters: epoch_settings
194-
.signer_registration_protocol_parameters,
193+
registration_protocol_parameters: epoch_settings.registration_protocol_parameters,
195194
protocol_initializer,
196195
current_signers: epoch_settings.current_signers,
197196
next_signers: epoch_settings.next_signers,
@@ -208,8 +207,8 @@ impl EpochService for MithrilEpochService {
208207
Ok(self.unwrap_data()?.epoch)
209208
}
210209

211-
fn signer_registration_protocol_parameters(&self) -> StdResult<&ProtocolParameters> {
212-
Ok(&self.unwrap_data()?.signer_registration_protocol_parameters)
210+
fn registration_protocol_parameters(&self) -> StdResult<&ProtocolParameters> {
211+
Ok(&self.unwrap_data()?.registration_protocol_parameters)
213212
}
214213

215214
fn protocol_initializer(&self) -> StdResult<&Option<ProtocolInitializer>> {
@@ -352,7 +351,7 @@ impl MithrilEpochService {
352351

353352
let epoch_data = EpochData {
354353
epoch,
355-
signer_registration_protocol_parameters: fake_data::protocol_parameters(),
354+
registration_protocol_parameters: fake_data::protocol_parameters(),
356355
protocol_initializer: None,
357356
current_signers: vec![],
358357
next_signers: vec![],
@@ -392,7 +391,7 @@ pub mod mock_epoch_service {
392391

393392
fn epoch_of_current_data(&self) -> StdResult<Epoch>;
394393

395-
fn signer_registration_protocol_parameters(&self) -> StdResult<&'static ProtocolParameters>;
394+
fn registration_protocol_parameters(&self) -> StdResult<&'static ProtocolParameters>;
396395

397396
fn protocol_initializer(&self) -> StdResult<&'static Option<ProtocolInitializer>>;
398397

@@ -640,7 +639,7 @@ mod tests {
640639
TestLogger::stdout(),
641640
);
642641
assert!(service.epoch_of_current_data().is_err());
643-
assert!(service.signer_registration_protocol_parameters().is_err());
642+
assert!(service.registration_protocol_parameters().is_err());
644643
assert!(service.protocol_initializer().is_err());
645644
assert!(service.current_signers().is_err());
646645
assert!(service.next_signers().is_err());
@@ -705,8 +704,8 @@ mod tests {
705704
service.epoch_of_current_data().unwrap()
706705
);
707706
assert_eq!(
708-
epoch_settings.signer_registration_protocol_parameters,
709-
*service.signer_registration_protocol_parameters().unwrap()
707+
epoch_settings.registration_protocol_parameters,
708+
*service.registration_protocol_parameters().unwrap()
710709
);
711710
assert!(
712711
service.protocol_initializer().unwrap().is_none(),

mithril-signer/tests/test_extensions/certificate_handler.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ impl AggregatorClient for FakeAggregator {
118118
epoch: time_point.epoch,
119119
current_signers,
120120
next_signers,
121-
signer_registration_protocol_parameters: fake_data::protocol_parameters(),
121+
registration_protocol_parameters: fake_data::protocol_parameters(),
122122
cardano_transactions_signing_config: Some(
123123
signed_entity_config
124124
.cardano_transactions_signing_config

0 commit comments

Comments
 (0)