Skip to content

Commit 0bdf04d

Browse files
sfauvelsfauvel
committed
Use new SlotNumber type in mithril-signer 
1 parent 7f19056 commit 0bdf04d

File tree

5 files changed

+30
-26
lines changed

5 files changed

+30
-26
lines changed

‎mithril-signer/src/cardano_transactions_importer.rs‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ mod tests {
237237
ScannedBlock::new(
238238
format!("block_hash-{}", block_number),
239239
BlockNumber(block_number),
240-
block_number * 100,
240+
SlotNumber(block_number * 100),
241241
vec![format!("tx_hash-{}", block_number)],
242242
)
243243
})
@@ -270,13 +270,13 @@ mod tests {
270270
ScannedBlock::new(
271271
"block_hash-1",
272272
BlockNumber(10),
273-
15,
273+
SlotNumber(15),
274274
vec!["tx_hash-1", "tx_hash-2"],
275275
),
276276
ScannedBlock::new(
277277
"block_hash-2",
278278
BlockNumber(20),
279-
25,
279+
SlotNumber(25),
280280
vec!["tx_hash-3", "tx_hash-4"],
281281
),
282282
];
@@ -416,18 +416,19 @@ mod tests {
416416
ScannedBlock::new(
417417
"block_hash-1",
418418
BlockNumber(10),
419-
15,
419+
SlotNumber(15),
420420
vec!["tx_hash-1", "tx_hash-2"],
421421
),
422422
ScannedBlock::new(
423423
"block_hash-2",
424424
BlockNumber(20),
425-
25,
425+
SlotNumber(25),
426426
vec!["tx_hash-3", "tx_hash-4"],
427427
),
428428
]]);
429429

430-
let last_tx = CardanoTransaction::new("tx-20", BlockNumber(30), 35, "block_hash-3");
430+
let last_tx =
431+
CardanoTransaction::new("tx-20", BlockNumber(30), SlotNumber(35), "block_hash-3");
431432
repository
432433
.store_transactions(vec![last_tx.clone()])
433434
.await
@@ -452,7 +453,8 @@ mod tests {
452453
SqliteConnectionPool::build_from_connection(connection),
453454
)));
454455

455-
let highest_stored_chain_point = ChainPoint::new(134, BlockNumber(10), "block_hash-1");
456+
let highest_stored_chain_point =
457+
ChainPoint::new(SlotNumber(134), BlockNumber(10), "block_hash-1");
456458
let stored_block = ScannedBlock::new(
457459
highest_stored_chain_point.block_hash.clone(),
458460
highest_stored_chain_point.block_number,
@@ -462,7 +464,7 @@ mod tests {
462464
let to_store_block = ScannedBlock::new(
463465
"block_hash-2",
464466
BlockNumber(20),
465-
229,
467+
SlotNumber(229),
466468
vec!["tx_hash-3", "tx_hash-4"],
467469
);
468470
let expected_transactions: Vec<CardanoTransaction> = [
@@ -733,13 +735,13 @@ mod tests {
733735
ScannedBlock::new(
734736
"block_hash-1",
735737
BlockNumber(10),
736-
15,
738+
SlotNumber(15),
737739
vec!["tx_hash-1", "tx_hash-2"],
738740
),
739741
ScannedBlock::new(
740742
"block_hash-2",
741743
BlockNumber(20),
742-
25,
744+
SlotNumber(25),
743745
vec!["tx_hash-3", "tx_hash-4"],
744746
),
745747
];
@@ -783,7 +785,7 @@ mod tests {
783785
let expected_remaining_transactions = ScannedBlock::new(
784786
"block_hash-130",
785787
BlockNumber(130),
786-
5,
788+
SlotNumber(5),
787789
vec!["tx_hash-6", "tx_hash-7"],
788790
)
789791
.into_transactions();
@@ -796,15 +798,15 @@ mod tests {
796798
ScannedBlock::new(
797799
"block_hash-131",
798800
BlockNumber(131),
799-
10,
801+
SlotNumber(10),
800802
vec!["tx_hash-8", "tx_hash-9", "tx_hash-10"],
801803
)
802804
.into_transactions(),
803805
)
804806
.await
805807
.unwrap();
806808

807-
let chain_point = ChainPoint::new(5, BlockNumber(130), "block_hash-130");
809+
let chain_point = ChainPoint::new(SlotNumber(5), BlockNumber(130), "block_hash-130");
808810
let scanner = DumbBlockScanner::new().backward(chain_point);
809811

810812
let importer =
@@ -859,7 +861,7 @@ mod tests {
859861
ScannedBlock::new(
860862
"block_hash-131",
861863
BlockRange::from_block_number(BlockRange::LENGTH * 3).start,
862-
1,
864+
SlotNumber(1),
863865
vec!["tx_hash-1", "tx_hash-2", "tx_hash-3"],
864866
)
865867
.into_transactions(),
@@ -870,7 +872,7 @@ mod tests {
870872
let block_range_roots = repository.get_all_block_range_root().unwrap();
871873
assert_eq!(6, block_range_roots.len());
872874

873-
let chain_point = ChainPoint::new(1, BlockRange::LENGTH * 3, "block_hash-131");
875+
let chain_point = ChainPoint::new(SlotNumber(1), BlockRange::LENGTH * 3, "block_hash-131");
874876
let scanner = DumbBlockScanner::new().backward(chain_point);
875877

876878
let importer =

‎mithril-signer/tests/create_cardano_transaction_single_signature.rs‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ mod test_extensions;
22

33
use mithril_common::{
44
crypto_helper::tests_setup,
5-
entities::{BlockNumber, ChainPoint, Epoch, SignedEntityTypeDiscriminants, TimePoint},
5+
entities::{
6+
BlockNumber, ChainPoint, Epoch, SignedEntityTypeDiscriminants, SlotNumber, TimePoint,
7+
},
68
test_utils::MithrilFixtureBuilder,
79
};
810

@@ -21,7 +23,7 @@ async fn test_create_cardano_transaction_single_signature() {
2123
epoch: Epoch(1),
2224
immutable_file_number: 1,
2325
chain_point: ChainPoint {
24-
slot_number: 100,
26+
slot_number: SlotNumber(100),
2527
// Note: the starting block number must be greater than the cardano_transactions_signing_config.step
2628
// so first block range root computation is not on block 0.
2729
block_number: BlockNumber(100),
@@ -68,7 +70,7 @@ async fn test_create_cardano_transaction_single_signature() {
6870

6971
.comment("new blocks means a new signature with the same stake distribution → Signed")
7072
.increase_block_number_and_slot_number(125, 295).await.unwrap()
71-
.cardano_chain_send_rollback(230).await.unwrap()
73+
.cardano_chain_send_rollback(SlotNumber(230)).await.unwrap()
7274
.cycle_registered().await.unwrap()
7375
.cycle_signed().await.unwrap()
7476

‎mithril-signer/tests/create_immutable_files_full_single_signature.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ mod test_extensions;
22

33
use mithril_common::{
44
crypto_helper::tests_setup,
5-
entities::{BlockNumber, ChainPoint, Epoch, TimePoint},
5+
entities::{BlockNumber, ChainPoint, Epoch, SlotNumber, TimePoint},
66
test_utils::MithrilFixtureBuilder,
77
};
88

@@ -19,7 +19,7 @@ async fn test_create_immutable_files_full_single_signature() {
1919
epoch: Epoch(1),
2020
immutable_file_number: 1,
2121
chain_point: ChainPoint {
22-
slot_number: 1,
22+
slot_number: SlotNumber(100),
2323
block_number: BlockNumber(100),
2424
block_hash: "block_hash-100".to_string(),
2525
},

‎mithril-signer/tests/era_switch.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ mod test_extensions;
22

33
use mithril_common::{
44
crypto_helper::tests_setup,
5-
entities::{BlockNumber, ChainPoint, Epoch, TimePoint},
5+
entities::{BlockNumber, ChainPoint, Epoch, SlotNumber, TimePoint},
66
era::{EraMarker, SupportedEra},
77
test_utils::MithrilFixtureBuilder,
88
};
@@ -18,7 +18,7 @@ async fn era_fail_at_startup() {
1818
epoch: Epoch(1),
1919
immutable_file_number: 1,
2020
chain_point: ChainPoint {
21-
slot_number: 1,
21+
slot_number: SlotNumber(1),
2222
block_number: BlockNumber(100),
2323
block_hash: "block_hash-100".to_string(),
2424
},

‎mithril-signer/tests/test_extensions/state_machine_tester.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ impl StateMachineTester {
452452
ScannedBlock::new(
453453
block_hash,
454454
BlockNumber(block_number),
455-
slot_number,
455+
SlotNumber(slot_number),
456456
vec![format!("tx_hash-{block_number}-1")],
457457
)
458458
})
@@ -472,12 +472,12 @@ impl StateMachineTester {
472472
.await
473473
.map_err(|err| TestError::SubsystemError(anyhow!(err)))?
474474
.map(|c| c.slot_number)
475-
.ok_or_else(|| TestError::ValueError("no block number returned".to_string()))?;
475+
.ok_or_else(|| TestError::ValueError("no slot number returned".to_string()))?;
476476

477477
let decrement = actual_slot_number - rollback_to_slot_number;
478478
let new_slot_number = self
479479
.chain_observer
480-
.decrease_slot_number(decrement)
480+
.decrease_slot_number(*decrement)
481481
.await
482482
.ok_or_else(|| TestError::ValueError("no slot number returned".to_string()))?;
483483

@@ -488,7 +488,7 @@ impl StateMachineTester {
488488

489489
let chain_point = ChainPoint {
490490
slot_number: rollback_to_slot_number,
491-
block_number: BlockNumber(rollback_to_slot_number),
491+
block_number: BlockNumber(*rollback_to_slot_number),
492492
block_hash: format!("block_hash-{rollback_to_slot_number}"),
493493
};
494494
self.block_scanner.add_backward(chain_point);

0 commit comments

Comments
 (0)