Skip to content

Commit cd624da

Browse files
sfauvelsfauvel
authored
Merge pull request #1854 from input-output-hk/ensemble/1851/slot_number_type
Replace `SlotNumber` alias with dedicated structure
2 parents 4c0d094 + 5c8af54 commit cd624da

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+805
-295
lines changed

‎Cargo.lock‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/mithril-persistence/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "mithril-persistence"
3-
version = "0.2.19"
3+
version = "0.2.20"
44
description = "Common types, interfaces, and utilities to persist data for Mithril nodes."
55
authors = { workspace = true }
66
edition = { workspace = true }

‎internal/mithril-persistence/src/database/query/cardano_transaction/delete_cardano_transaction.rs‎

Lines changed: 38 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ mod tests {
5959

6060
use super::*;
6161

62+
use mithril_common::entities::SlotNumber;
63+
6264
fn insert_transactions(connection: &SqliteConnection, records: Vec<CardanoTransactionRecord>) {
6365
connection
6466
.fetch_first(InsertCardanoTransactionQuery::insert_many(records).unwrap())
@@ -67,12 +69,42 @@ mod tests {
6769

6870
fn test_transaction_set() -> Vec<CardanoTransactionRecord> {
6971
vec![
70-
CardanoTransactionRecord::new("tx-hash-0", BlockNumber(10), 50, "block-hash-10"),
71-
CardanoTransactionRecord::new("tx-hash-1", BlockNumber(10), 51, "block-hash-10"),
72-
CardanoTransactionRecord::new("tx-hash-2", BlockNumber(11), 52, "block-hash-11"),
73-
CardanoTransactionRecord::new("tx-hash-3", BlockNumber(11), 53, "block-hash-11"),
74-
CardanoTransactionRecord::new("tx-hash-4", BlockNumber(12), 54, "block-hash-12"),
75-
CardanoTransactionRecord::new("tx-hash-5", BlockNumber(12), 55, "block-hash-12"),
72+
CardanoTransactionRecord::new(
73+
"tx-hash-0",
74+
BlockNumber(10),
75+
SlotNumber(50),
76+
"block-hash-10",
77+
),
78+
CardanoTransactionRecord::new(
79+
"tx-hash-1",
80+
BlockNumber(10),
81+
SlotNumber(51),
82+
"block-hash-10",
83+
),
84+
CardanoTransactionRecord::new(
85+
"tx-hash-2",
86+
BlockNumber(11),
87+
SlotNumber(52),
88+
"block-hash-11",
89+
),
90+
CardanoTransactionRecord::new(
91+
"tx-hash-3",
92+
BlockNumber(11),
93+
SlotNumber(53),
94+
"block-hash-11",
95+
),
96+
CardanoTransactionRecord::new(
97+
"tx-hash-4",
98+
BlockNumber(12),
99+
SlotNumber(54),
100+
"block-hash-12",
101+
),
102+
CardanoTransactionRecord::new(
103+
"tx-hash-5",
104+
BlockNumber(12),
105+
SlotNumber(55),
106+
"block-hash-12",
107+
),
76108
]
77109
}
78110

‎internal/mithril-persistence/src/database/query/cardano_transaction/get_cardano_transaction.rs‎

Lines changed: 37 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ impl GetCardanoTransactionQuery {
7676
Self {
7777
condition: WhereCondition::new(
7878
"slot_number = ?*",
79-
vec![Value::Integer(slot_number as i64)],
79+
vec![Value::Integer(*slot_number as i64)],
8080
),
8181
}
8282
}
@@ -132,10 +132,30 @@ mod tests {
132132
insert_transactions(
133133
&connection,
134134
vec![
135-
CardanoTransactionRecord::new("tx-hash-0", BlockNumber(10), 50, "block-hash-10"),
136-
CardanoTransactionRecord::new("tx-hash-1", BlockNumber(10), 51, "block-hash-10"),
137-
CardanoTransactionRecord::new("tx-hash-2", BlockNumber(11), 54, "block-hash-11"),
138-
CardanoTransactionRecord::new("tx-hash-3", BlockNumber(11), 55, "block-hash-11"),
135+
CardanoTransactionRecord::new(
136+
"tx-hash-0",
137+
BlockNumber(10),
138+
SlotNumber(50),
139+
"block-hash-10",
140+
),
141+
CardanoTransactionRecord::new(
142+
"tx-hash-1",
143+
BlockNumber(10),
144+
SlotNumber(51),
145+
"block-hash-10",
146+
),
147+
CardanoTransactionRecord::new(
148+
"tx-hash-2",
149+
BlockNumber(11),
150+
SlotNumber(54),
151+
"block-hash-11",
152+
),
153+
CardanoTransactionRecord::new(
154+
"tx-hash-3",
155+
BlockNumber(11),
156+
SlotNumber(55),
157+
"block-hash-11",
158+
),
139159
],
140160
);
141161

@@ -144,8 +164,18 @@ mod tests {
144164
.unwrap();
145165
assert_eq!(
146166
vec![
147-
CardanoTransactionRecord::new("tx-hash-2", BlockNumber(11), 54, "block-hash-11"),
148-
CardanoTransactionRecord::new("tx-hash-3", BlockNumber(11), 55, "block-hash-11"),
167+
CardanoTransactionRecord::new(
168+
"tx-hash-2",
169+
BlockNumber(11),
170+
SlotNumber(54),
171+
"block-hash-11"
172+
),
173+
CardanoTransactionRecord::new(
174+
"tx-hash-3",
175+
BlockNumber(11),
176+
SlotNumber(55),
177+
"block-hash-11"
178+
),
149179
],
150180
records
151181
);

‎internal/mithril-persistence/src/database/record/cardano_transaction.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ impl SqLiteEntity for CardanoTransactionRecord {
7575
Ok(Self {
7676
transaction_hash: transaction_hash.to_string(),
7777
block_number: BlockNumber(block_number),
78-
slot_number,
78+
slot_number: SlotNumber(slot_number),
7979
block_hash: block_hash.to_string(),
8080
})
8181
}

0 commit comments

Comments
 (0)