Skip to content

Commit be456f8

Browse files
committed
Rename signer registered_at to last_registered_at
1 parent bba21dc commit be456f8

File tree

3 files changed

+35
-31
lines changed

3 files changed

+35
-31
lines changed

mithril-aggregator/src/database/migration.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -592,13 +592,13 @@ where signed_entity.signed_entity_type_id = 2;
592592
"#,
593593
),
594594
// Migration 19
595-
// Alter `signer` table to add `registered_at` field with base value copied from the
595+
// Alter `signer` table to add `last_registered_at` field with base value copied from the
596596
// `created_at` field.
597597
SqlMigration::new(
598598
19,
599599
r#"
600-
alter table signer add column registered_at text null;
601-
update signer set registered_at = created_at;
600+
alter table signer add column last_registered_at text null;
601+
update signer set last_registered_at = created_at;
602602
"#,
603603
),
604604
]

mithril-aggregator/src/database/provider/signer.rs

Lines changed: 29 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ pub struct SignerRecord {
3131
/// Date and time when the signer was updated.
3232
pub updated_at: DateTime<Utc>,
3333

34-
/// Date and time when the signer first registered.
35-
pub registered_at: Option<DateTime<Utc>>,
34+
/// Date and time when the signer registered for the last time.
35+
pub last_registered_at: Option<DateTime<Utc>>,
3636
}
3737

3838
impl SqLiteEntity for SignerRecord {
@@ -63,7 +63,7 @@ impl SqLiteEntity for SignerRecord {
6363
))
6464
})?
6565
.with_timezone(&Utc),
66-
registered_at: registered_at
66+
last_registered_at: registered_at
6767
.map(|d| match DateTime::parse_from_rfc3339(d) {
6868
Ok(date) => Ok(date.with_timezone(&Utc)),
6969
Err(e) => Err(HydrationError::InvalidData(format!(
@@ -82,7 +82,11 @@ impl SqLiteEntity for SignerRecord {
8282
projection.add_field("pool_ticker", "{:signer:}.pool_ticker", "text");
8383
projection.add_field("created_at", "{:signer:}.created_at", "text");
8484
projection.add_field("updated_at", "{:signer:}.updated_at", "text");
85-
projection.add_field("registered_at", "{:signer:}.registered_at", "text");
85+
projection.add_field(
86+
"last_registered_at",
87+
"{:signer:}.last_registered_at",
88+
"text",
89+
);
8690

8791
projection
8892
}
@@ -150,7 +154,7 @@ impl<'conn> RegisterSignerRecordProvider<'conn> {
150154

151155
fn get_register_condition(&self, signer_record: SignerRecord) -> WhereCondition {
152156
WhereCondition::new(
153-
"(signer_id, pool_ticker, created_at, updated_at, registered_at) values (?*, ?*, ?*, ?*, ?*)",
157+
"(signer_id, pool_ticker, created_at, updated_at, last_registered_at) values (?*, ?*, ?*, ?*, ?*)",
154158
vec![
155159
Value::String(signer_record.signer_id),
156160
signer_record
@@ -160,7 +164,7 @@ impl<'conn> RegisterSignerRecordProvider<'conn> {
160164
Value::String(signer_record.created_at.to_rfc3339()),
161165
Value::String(signer_record.updated_at.to_rfc3339()),
162166
signer_record
163-
.registered_at
167+
.last_registered_at
164168
.map(|d| Value::String(d.to_rfc3339()))
165169
.unwrap_or(Value::Null),
166170
],
@@ -193,7 +197,7 @@ impl<'conn> Provider<'conn> for RegisterSignerRecordProvider<'conn> {
193197

194198
format!(
195199
"insert into signer {condition} on conflict (signer_id) do update set \
196-
updated_at = excluded.updated_at, registered_at = excluded.registered_at returning {projection}"
200+
updated_at = excluded.updated_at, last_registered_at = excluded.last_registered_at returning {projection}"
197201
)
198202
}
199203
}
@@ -210,7 +214,7 @@ impl<'conn> ImportSignerRecordProvider<'conn> {
210214
}
211215

212216
fn get_import_condition(&self, signer_records: Vec<SignerRecord>) -> WhereCondition {
213-
let columns = "(signer_id, pool_ticker, created_at, updated_at, registered_at)";
217+
let columns = "(signer_id, pool_ticker, created_at, updated_at, last_registered_at)";
214218
let values_columns: Vec<&str> = repeat("(?*, ?*, ?*, ?*, ?*)")
215219
.take(signer_records.len())
216220
.collect();
@@ -226,7 +230,7 @@ impl<'conn> ImportSignerRecordProvider<'conn> {
226230
Value::String(signer_record.created_at.to_rfc3339()),
227231
Value::String(signer_record.updated_at.to_rfc3339()),
228232
signer_record
229-
.registered_at
233+
.last_registered_at
230234
.map(|d| Value::String(d.to_rfc3339()))
231235
.unwrap_or(Value::Null),
232236
]
@@ -295,7 +299,7 @@ impl SignerStore {
295299
Self { connection }
296300
}
297301

298-
/// Import a signer in the database, its registered_at date will be left empty
302+
/// Import a signer in the database, its last_registered_at date will be left empty
299303
pub async fn import_signer(
300304
&self,
301305
signer_id: String,
@@ -310,14 +314,14 @@ impl SignerStore {
310314
pool_ticker,
311315
created_at,
312316
updated_at,
313-
registered_at: None,
317+
last_registered_at: None,
314318
};
315319
provider.persist(signer_record)?;
316320

317321
Ok(())
318322
}
319323

320-
/// Create many signers at once in the database, their registered_at date will be left empty
324+
/// Create many signers at once in the database, their last_registered_at date will be left empty
321325
pub async fn import_many_signers(
322326
&self,
323327
pool_ticker_by_id: HashMap<String, Option<String>>,
@@ -334,7 +338,7 @@ impl SignerStore {
334338
pool_ticker,
335339
created_at,
336340
updated_at,
337-
registered_at: None,
341+
last_registered_at: None,
338342
})
339343
.collect();
340344

@@ -357,7 +361,7 @@ impl SignerRecorder for SignerStore {
357361
pool_ticker: None,
358362
created_at,
359363
updated_at,
360-
registered_at,
364+
last_registered_at: registered_at,
361365
};
362366
provider.persist(signer_record)?;
363367

@@ -396,7 +400,7 @@ mod tests {
396400
updated_at: DateTime::parse_from_rfc3339("2024-01-19T13:43:05.618857482Z")
397401
.unwrap()
398402
.with_timezone(&Utc),
399-
registered_at: Some(
403+
last_registered_at: Some(
400404
DateTime::parse_from_rfc3339("2023-01-19T13:43:05.618857482Z")
401405
.unwrap()
402406
.with_timezone(&Utc),
@@ -442,7 +446,7 @@ mod tests {
442446
(
443447
5,
444448
signer_record
445-
.registered_at
449+
.last_registered_at
446450
.map(|d| Value::String(d.to_rfc3339()))
447451
.unwrap_or(Value::Null),
448452
),
@@ -461,7 +465,7 @@ mod tests {
461465

462466
assert_eq!(
463467
"s.signer_id as signer_id, s.pool_ticker as pool_ticker, s.created_at as created_at, \
464-
s.updated_at as updated_at, s.registered_at as registered_at"
468+
s.updated_at as updated_at, s.last_registered_at as last_registered_at"
465469
.to_string(),
466470
projection.expand(aliases)
467471
);
@@ -489,7 +493,7 @@ mod tests {
489493
let (values, params) = condition.expand();
490494

491495
assert_eq!(
492-
"(signer_id, pool_ticker, created_at, updated_at, registered_at) values (?1, ?2, ?3, ?4, ?5)".to_string(),
496+
"(signer_id, pool_ticker, created_at, updated_at, last_registered_at) values (?1, ?2, ?3, ?4, ?5)".to_string(),
493497
values
494498
);
495499
assert_eq!(
@@ -498,7 +502,7 @@ mod tests {
498502
Value::String(signer_record.pool_ticker.unwrap()),
499503
Value::String(signer_record.created_at.to_rfc3339()),
500504
Value::String(signer_record.updated_at.to_rfc3339()),
501-
Value::String(signer_record.registered_at.unwrap().to_rfc3339()),
505+
Value::String(signer_record.last_registered_at.unwrap().to_rfc3339()),
502506
],
503507
params
504508
);
@@ -513,7 +517,7 @@ mod tests {
513517
let (values, params) = condition.expand();
514518

515519
assert_eq!(
516-
"(signer_id, pool_ticker, created_at, updated_at, registered_at) values (?1, ?2, ?3, ?4, ?5), (?6, ?7, ?8, ?9, ?10)",
520+
"(signer_id, pool_ticker, created_at, updated_at, last_registered_at) values (?1, ?2, ?3, ?4, ?5), (?6, ?7, ?8, ?9, ?10)",
517521
&values
518522
);
519523
assert_eq!(
@@ -522,12 +526,12 @@ mod tests {
522526
Value::String(signer_records[0].pool_ticker.to_owned().unwrap()),
523527
Value::String(signer_records[0].created_at.to_rfc3339()),
524528
Value::String(signer_records[0].updated_at.to_rfc3339()),
525-
Value::String(signer_records[0].registered_at.unwrap().to_rfc3339()),
529+
Value::String(signer_records[0].last_registered_at.unwrap().to_rfc3339()),
526530
Value::String(signer_records[1].signer_id.to_owned()),
527531
Value::String(signer_records[1].pool_ticker.to_owned().unwrap()),
528532
Value::String(signer_records[1].created_at.to_rfc3339()),
529533
Value::String(signer_records[1].updated_at.to_rfc3339()),
530-
Value::String(signer_records[1].registered_at.unwrap().to_rfc3339()),
534+
Value::String(signer_records[1].last_registered_at.unwrap().to_rfc3339()),
531535
],
532536
params
533537
);
@@ -674,7 +678,7 @@ mod tests {
674678
assert!(
675679
signer_records_stored
676680
.iter()
677-
.all(|s| s.registered_at.is_some()),
681+
.all(|s| s.last_registered_at.is_some()),
678682
"registering a signer should set the registration date"
679683
)
680684
}
@@ -711,7 +715,7 @@ mod tests {
711715
assert!(
712716
signer_records_stored
713717
.iter()
714-
.all(|s| s.registered_at.is_none()),
718+
.all(|s| s.last_registered_at.is_none()),
715719
"imported signer should not have a registration date"
716720
)
717721
}
@@ -743,7 +747,7 @@ mod tests {
743747
assert!(
744748
signer_records_stored
745749
.iter()
746-
.all(|s| s.registered_at.is_none()),
750+
.all(|s| s.last_registered_at.is_none()),
747751
"imported signer should not have a registration date"
748752
);
749753
}

mithril-aggregator/src/http_server/routes/signer_routes.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ mod handlers {
213213
.map(|s| SignerTickerMessage {
214214
party_id: s.signer_id,
215215
pool_ticker: s.pool_ticker,
216-
has_registered: s.registered_at.is_some(),
216+
has_registered: s.last_registered_at.is_some(),
217217
})
218218
.collect();
219219
Ok(reply::json(&message, StatusCode::OK))
@@ -548,14 +548,14 @@ mod tests {
548548
pool_ticker: None,
549549
created_at: Default::default(),
550550
updated_at: Default::default(),
551-
registered_at: None,
551+
last_registered_at: None,
552552
},
553553
SignerRecord {
554554
signer_id: "pool_with_ticker".to_string(),
555555
pool_ticker: Some("pool_ticker".to_string()),
556556
created_at: Default::default(),
557557
updated_at: Default::default(),
558-
registered_at: None,
558+
last_registered_at: None,
559559
},
560560
])
561561
})

0 commit comments

Comments
 (0)