Skip to content

Commit 1a6bb77

Browse files
turmelclemturmelclem
committed
refactor(chore): change CardanoBlocksTransactionsSigningConfig security_parameter from BlockNumber to BlockNumberOffset
1 parent 0e54d96 commit 1a6bb77

17 files changed

Lines changed: 68 additions & 64 deletions

File tree

‎internal/mithril-protocol-config/src/http.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ mod tests {
126126
let configuration_epoch_41 = ProtocolConfigurationMessage {
127127
protocol_parameters: ProtocolParameters::new(1000, 100, 0.1),
128128
cardano_transactions_signing_config: Some(CardanoTransactionsSigningConfig {
129-
security_parameter: BlockNumber(1),
129+
security_parameter: BlockNumberOffset(1),
130130
step: BlockNumber(10),
131131
}),
132132
cardano_blocks_transactions_signing_config: Some(
@@ -188,7 +188,7 @@ mod tests {
188188
.signed_entity_types_config
189189
.cardano_transactions,
190190
Some(CardanoTransactionsSigningConfig {
191-
security_parameter: BlockNumber(1),
191+
security_parameter: BlockNumberOffset(1),
192192
step: BlockNumber(10),
193193
})
194194
);

‎internal/mithril-protocol-config/src/test/double/configuration_provider.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ mod tests {
9494
signed_entity_types_config: SignedEntityTypeConfiguration {
9595
cardano_transactions: Some(CardanoTransactionsSigningConfig {
9696
step: BlockNumber(10),
97-
security_parameter: BlockNumber(100),
97+
security_parameter: BlockNumberOffset(100),
9898
}),
9999
cardano_blocks_transactions: Some(CardanoBlocksTransactionsSigningConfig {
100100
step: BlockNumber(11),
@@ -113,7 +113,7 @@ mod tests {
113113
signed_entity_types_config: SignedEntityTypeConfiguration {
114114
cardano_transactions: Some(CardanoTransactionsSigningConfig {
115115
step: BlockNumber(20),
116-
security_parameter: BlockNumber(200),
116+
security_parameter: BlockNumberOffset(200),
117117
}),
118118
cardano_blocks_transactions: Some(CardanoBlocksTransactionsSigningConfig {
119119
step: BlockNumber(22),
@@ -132,7 +132,7 @@ mod tests {
132132
signed_entity_types_config: SignedEntityTypeConfiguration {
133133
cardano_transactions: Some(CardanoTransactionsSigningConfig {
134134
step: BlockNumber(30),
135-
security_parameter: BlockNumber(300),
135+
security_parameter: BlockNumberOffset(300),
136136
}),
137137
cardano_blocks_transactions: Some(CardanoBlocksTransactionsSigningConfig {
138138
step: BlockNumber(33),

‎mithril-aggregator/src/configuration.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -828,7 +828,7 @@ impl ServeCommandConfiguration {
828828
cardano_transactions_prover_cache_pool_size: 3,
829829
cardano_transactions_database_connection_pool_size: 5,
830830
cardano_transactions_signing_config: Some(CardanoTransactionsSigningConfig {
831-
security_parameter: BlockNumber(120),
831+
security_parameter: BlockNumberOffset(120),
832832
step: BlockNumber(15),
833833
}),
834834
cardano_blocks_transactions_signing_config: Some(
@@ -1196,7 +1196,7 @@ impl Default for DefaultConfiguration {
11961196
cardano_transactions_prover_cache_pool_size: 10,
11971197
cardano_transactions_database_connection_pool_size: 10,
11981198
cardano_transactions_signing_config: CardanoTransactionsSigningConfig {
1199-
security_parameter: BlockNumber(3000),
1199+
security_parameter: BlockNumberOffset(3000),
12001200
step: BlockNumber(120),
12011201
},
12021202
cardano_blocks_transactions_signing_config: CardanoBlocksTransactionsSigningConfig {
@@ -1592,7 +1592,7 @@ mod test {
15921592
SignedEntityTypeDiscriminants::CardanoTransactions.to_string(),
15931593
),
15941594
cardano_transactions_signing_config: Some(CardanoTransactionsSigningConfig {
1595-
security_parameter: BlockNumber(10),
1595+
security_parameter: BlockNumberOffset(10),
15961596
step: BlockNumber(30),
15971597
}),
15981598
protocol_parameters: Some(ProtocolParameters::new(2, 3, 4.1)),
@@ -1603,7 +1603,7 @@ mod test {
16031603

16041604
assert_eq!(
16051605
Some(CardanoTransactionsSigningConfig {
1606-
security_parameter: BlockNumber(10),
1606+
security_parameter: BlockNumberOffset(10),
16071607
step: BlockNumber(30),
16081608
}),
16091609
epoch_settings.cardano_transactions_signing_config

‎mithril-aggregator/src/database/query/epoch_settings/get_epoch_settings.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ impl Query for GetEpochSettingsQuery {
4545
#[cfg(test)]
4646
mod tests {
4747
use mithril_common::entities::{
48-
BlockNumber, CardanoTransactionsSigningConfig, ProtocolParameters,
48+
BlockNumber, BlockNumberOffset, CardanoTransactionsSigningConfig, ProtocolParameters,
4949
};
5050
use mithril_persistence::sqlite::ConnectionExtensions;
5151

@@ -70,7 +70,7 @@ mod tests {
7070

7171
assert_eq!(
7272
Some(CardanoTransactionsSigningConfig {
73-
security_parameter: BlockNumber(10),
73+
security_parameter: BlockNumberOffset(10),
7474
step: BlockNumber(15)
7575
}),
7676
epoch_settings_record.cardano_transactions_signing_config
@@ -87,7 +87,7 @@ mod tests {
8787
);
8888
assert_eq!(
8989
Some(CardanoTransactionsSigningConfig {
90-
security_parameter: BlockNumber(30),
90+
security_parameter: BlockNumberOffset(30),
9191
step: BlockNumber(15),
9292
}),
9393
epoch_settings_record.cardano_transactions_signing_config

‎mithril-aggregator/src/database/query/epoch_settings/insert_or_ignore_epoch_settings.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ mod tests {
7575
epoch_settings_id: Epoch(3),
7676
protocol_parameters: fake_data::protocol_parameters(),
7777
cardano_transactions_signing_config: Some(CardanoTransactionsSigningConfig {
78-
security_parameter: BlockNumber(24),
78+
security_parameter: BlockNumberOffset(24),
7979
step: BlockNumber(62),
8080
}),
8181
cardano_blocks_transactions_signing_config: Some(
@@ -116,7 +116,7 @@ mod tests {
116116
epoch_settings_id: Epoch(3),
117117
protocol_parameters: fake_data::protocol_parameters(),
118118
cardano_transactions_signing_config: Some(CardanoTransactionsSigningConfig {
119-
security_parameter: BlockNumber(24),
119+
security_parameter: BlockNumberOffset(24),
120120
step: BlockNumber(62),
121121
}),
122122
cardano_blocks_transactions_signing_config: Some(
@@ -136,7 +136,7 @@ mod tests {
136136
let record = connection
137137
.fetch_first(InsertOrIgnoreEpochSettingsQuery::one(EpochSettingsRecord {
138138
cardano_transactions_signing_config: Some(CardanoTransactionsSigningConfig {
139-
security_parameter: BlockNumber(134),
139+
security_parameter: BlockNumberOffset(134),
140140
step: BlockNumber(872),
141141
}),
142142
cardano_blocks_transactions_signing_config: Some(

‎mithril-aggregator/src/database/test_helper.rs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ use std::path::Path;
44
use uuid::Uuid;
55

66
use mithril_common::entities::{
7-
BlockNumber, CardanoTransactionsSigningConfig, ProtocolParameters, SignerWithStake,
7+
BlockNumber, BlockNumberOffset, CardanoTransactionsSigningConfig, ProtocolParameters,
8+
SignerWithStake,
89
};
910
use mithril_common::{StdError, StdResult, entities::Epoch, test::double::fake_keys};
1011
use mithril_persistence::sqlite::{
@@ -207,7 +208,7 @@ pub fn insert_epoch_settings(
207208
epoch,
208209
ProtocolParameters::new(*epoch, epoch + 1, 1.0),
209210
CardanoTransactionsSigningConfig {
210-
security_parameter: BlockNumber(epoch * 10),
211+
security_parameter: BlockNumberOffset(epoch * 10),
211212
step: BlockNumber(15),
212213
},
213214
)

‎mithril-aggregator/src/services/epoch_service.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1103,7 +1103,7 @@ mod tests {
11031103
let epoch = Epoch(5);
11041104

11051105
let cardano_transactions_signing_config = Some(CardanoTransactionsSigningConfig {
1106-
security_parameter: BlockNumber(29),
1106+
security_parameter: BlockNumberOffset(29),
11071107
step: BlockNumber(986),
11081108
});
11091109
let cardano_blocks_transactions_signing_config =
@@ -1322,7 +1322,7 @@ mod tests {
13221322
let expected_epoch_settings = AggregatorEpochSettings {
13231323
protocol_parameters: ProtocolParameters::new(6, 89, 0.124),
13241324
cardano_transactions_signing_config: Some(CardanoTransactionsSigningConfig {
1325-
security_parameter: BlockNumber(1),
1325+
security_parameter: BlockNumberOffset(1),
13261326
step: BlockNumber(11),
13271327
}),
13281328
cardano_blocks_transactions_signing_config: Some(
@@ -1337,15 +1337,15 @@ mod tests {
13371337
aggregation_configuration
13381338
.signed_entity_types_config
13391339
.cardano_transactions = Some(CardanoTransactionsSigningConfig {
1340-
security_parameter: BlockNumber(2),
1340+
security_parameter: BlockNumberOffset(2),
13411341
step: BlockNumber(22),
13421342
});
13431343

13441344
let mut next_aggregation_configuration = MithrilNetworkConfigurationForEpoch::dummy();
13451345
next_aggregation_configuration
13461346
.signed_entity_types_config
13471347
.cardano_transactions = Some(CardanoTransactionsSigningConfig {
1348-
security_parameter: BlockNumber(3),
1348+
security_parameter: BlockNumberOffset(3),
13491349
step: BlockNumber(33),
13501350
});
13511351

‎mithril-aggregator/src/services/message.rs‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -571,7 +571,10 @@ mod tests {
571571
#[allow(deprecated)]
572572
mod epoch_settings {
573573
use mithril_common::{
574-
entities::{CardanoTransactionsSigningConfig, ProtocolParameters, SignedEntityConfig},
574+
entities::{
575+
BlockNumberOffset, CardanoTransactionsSigningConfig, ProtocolParameters,
576+
SignedEntityConfig,
577+
},
575578
test::builder::MithrilFixtureBuilder,
576579
};
577580

@@ -603,7 +606,7 @@ mod tests {
603606
assert_eq!(
604607
message.cardano_transactions_signing_config,
605608
Some(CardanoTransactionsSigningConfig {
606-
security_parameter: BlockNumber(0),
609+
security_parameter: BlockNumberOffset(0),
607610
step: BlockNumber(15)
608611
})
609612
);
@@ -687,7 +690,7 @@ mod tests {
687690
#[tokio::test]
688691
async fn get_epoch_settings_message_retrieves_signing_configuration_from_epoch_service() {
689692
let expected_ctx_config = CardanoTransactionsSigningConfig {
690-
security_parameter: BlockNumber(100),
693+
security_parameter: BlockNumberOffset(100),
691694
step: BlockNumber(15),
692695
};
693696
let epoch_service = FakeEpochServiceBuilder {
@@ -824,7 +827,7 @@ mod tests {
824827
let aggregator_epoch_settings = AggregatorEpochSettings {
825828
protocol_parameters: ProtocolParameters::new(5, 100, 0.65),
826829
cardano_transactions_signing_config: Some(CardanoTransactionsSigningConfig {
827-
security_parameter: BlockNumber(10),
830+
security_parameter: BlockNumberOffset(10),
828831
step: BlockNumber(15),
829832
}),
830833
cardano_blocks_transactions_signing_config: Some(
@@ -852,7 +855,7 @@ mod tests {
852855
assert_eq!(
853856
message.cardano_transactions_signing_config,
854857
Some(CardanoTransactionsSigningConfig {
855-
security_parameter: BlockNumber(10),
858+
security_parameter: BlockNumberOffset(10),
856859
step: BlockNumber(15)
857860
})
858861
);

‎mithril-aggregator/src/services/network_configuration_provider.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ mod tests {
270270
let local_configuration_epoch_settings = AggregatorEpochSettings {
271271
protocol_parameters: ProtocolParameters::new(3000, 300, 0.3),
272272
cardano_transactions_signing_config: Some(CardanoTransactionsSigningConfig {
273-
security_parameter: BlockNumber(3),
273+
security_parameter: BlockNumberOffset(3),
274274
step: BlockNumber(30),
275275
}),
276276
cardano_blocks_transactions_signing_config: Some(
@@ -292,7 +292,7 @@ mod tests {
292292
protocol_parameters: ProtocolParameters::new(1000, 100, 0.1),
293293
cardano_transactions_signing_config: Some(
294294
CardanoTransactionsSigningConfig {
295-
security_parameter: BlockNumber(1),
295+
security_parameter: BlockNumberOffset(1),
296296
step: BlockNumber(10),
297297
},
298298
),
@@ -310,7 +310,7 @@ mod tests {
310310
protocol_parameters: ProtocolParameters::new(2000, 200, 0.2),
311311
cardano_transactions_signing_config: Some(
312312
CardanoTransactionsSigningConfig {
313-
security_parameter: BlockNumber(2),
313+
security_parameter: BlockNumberOffset(2),
314314
step: BlockNumber(20),
315315
},
316316
),
@@ -336,7 +336,7 @@ mod tests {
336336
enabled_signed_entity_types: SignedEntityTypeDiscriminants::all(),
337337
signed_entity_types_config: SignedEntityTypeConfiguration {
338338
cardano_transactions: Some(CardanoTransactionsSigningConfig {
339-
security_parameter: BlockNumber(1),
339+
security_parameter: BlockNumberOffset(1),
340340
step: BlockNumber(10),
341341
}),
342342
cardano_blocks_transactions: Some(CardanoBlocksTransactionsSigningConfig {
@@ -354,7 +354,7 @@ mod tests {
354354
enabled_signed_entity_types: SignedEntityTypeDiscriminants::all(),
355355
signed_entity_types_config: SignedEntityTypeConfiguration {
356356
cardano_transactions: Some(CardanoTransactionsSigningConfig {
357-
security_parameter: BlockNumber(2),
357+
security_parameter: BlockNumberOffset(2),
358358
step: BlockNumber(20),
359359
}),
360360
cardano_blocks_transactions: Some(CardanoBlocksTransactionsSigningConfig {
@@ -372,7 +372,7 @@ mod tests {
372372
enabled_signed_entity_types: SignedEntityTypeDiscriminants::all(),
373373
signed_entity_types_config: SignedEntityTypeConfiguration {
374374
cardano_transactions: Some(CardanoTransactionsSigningConfig {
375-
security_parameter: BlockNumber(3),
375+
security_parameter: BlockNumberOffset(3),
376376
step: BlockNumber(30),
377377
}),
378378
cardano_blocks_transactions: Some(CardanoBlocksTransactionsSigningConfig {

‎mithril-aggregator/tests/create_certificate.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ async fn create_certificate() {
3434
),
3535
data_stores_directory: get_test_dir("create_certificate"),
3636
cardano_transactions_signing_config: Some(CardanoTransactionsSigningConfig {
37-
security_parameter: BlockNumber(0),
37+
security_parameter: BlockNumberOffset(0),
3838
step: BlockNumber(30),
3939
}),
4040
cardano_blocks_transactions_signing_config: Some(CardanoBlocksTransactionsSigningConfig {

0 commit comments

Comments
 (0)