From df0cadc02e1875c0a9a2f8d3e97ea80825f457e5 Mon Sep 17 00:00:00 2001
From: Pekka Enberg <penberg@iki.fi>
Date: Sat, 8 Apr 2023 18:37:23 +0300
Subject: [PATCH] Clean up LocalClock default trait

---
 core/mvcc/database/src/lib.rs | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/core/mvcc/database/src/lib.rs b/core/mvcc/database/src/lib.rs
index 97a9b62d5..40c17cd91 100644
--- a/core/mvcc/database/src/lib.rs
+++ b/core/mvcc/database/src/lib.rs
@@ -122,7 +122,7 @@ pub trait LogicalClock {
 }
 
 /// A node-local clock backed by an atomic counter.
-#[derive(Debug)]
+#[derive(Debug, Default)]
 pub struct LocalClock {
     ts_sequence: AtomicU64,
 }
@@ -141,12 +141,6 @@ impl LogicalClock for LocalClock {
     }
 }
 
-impl Default for LocalClock {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
 #[derive(Debug)]
 pub struct DatabaseInner<Clock: LogicalClock> {
     rows: RefCell<HashMap<u64, Vec<RowVersion>>>,
@@ -414,7 +408,7 @@ mod tests {
 
     #[test]
     fn test_insert_read() {
-        let clock = LocalClock::new();
+        let clock = LocalClock::default();
         let db = Database::new(clock);
 
         let tx1 = db.begin_tx();
@@ -434,7 +428,7 @@ mod tests {
 
     #[test]
     fn test_read_nonexistent() {
-        let clock = LocalClock::new();
+        let clock = LocalClock::default();
         let db = Database::new(clock);
         let tx = db.begin_tx();
         let row = db.read(tx, 1);
@@ -443,7 +437,7 @@ mod tests {
 
     #[test]
     fn test_delete() {
-        let clock = LocalClock::new();
+        let clock = LocalClock::default();
         let db = Database::new(clock);
 
         let tx1 = db.begin_tx();
@@ -466,7 +460,7 @@ mod tests {
 
     #[test]
     fn test_delete_nonexistent() {
-        let clock = LocalClock::new();
+        let clock = LocalClock::default();
         let db = Database::new(clock);
         let tx = db.begin_tx();
         assert_eq!(false, db.delete(tx, 1));
@@ -474,7 +468,7 @@ mod tests {
 
     #[test]
     fn test_commit() {
-        let clock = LocalClock::new();
+        let clock = LocalClock::default();
         let db = Database::new(clock);
         let tx1 = db.begin_tx();
         let tx1_row = Row {
@@ -501,7 +495,7 @@ mod tests {
 
     #[test]
     fn test_rollback() {
-        let clock = LocalClock::new();
+        let clock = LocalClock::default();
         let db = Database::new(clock);
         let tx1 = db.begin_tx();
         let row1 = Row {
@@ -526,7 +520,7 @@ mod tests {
 
     #[test]
     fn test_dirty_write() {
-        let clock = LocalClock::new();
+        let clock = LocalClock::default();
         let db = Database::new(clock);
 
         // T1 inserts a row with ID 1, but does not commit.
@@ -553,7 +547,7 @@ mod tests {
 
     #[test]
     fn test_dirty_read() {
-        let clock = LocalClock::new();
+        let clock = LocalClock::default();
         let db = Database::new(clock);
 
         // T1 inserts a row with ID 1, but does not commit.
@@ -573,7 +567,7 @@ mod tests {
     #[ignore]
     #[test]
     fn test_dirty_read_deleted() {
-        let clock = LocalClock::new();
+        let clock = LocalClock::default();
         let db = Database::new(clock);
 
         // T1 inserts a row with ID 1 and commits.
@@ -597,7 +591,7 @@ mod tests {
 
     #[test]
     fn test_fuzzy_read() {
-        let clock = LocalClock::new();
+        let clock = LocalClock::default();
         let db = Database::new(clock);
 
         // T1 inserts a row with ID 1 and commits.
@@ -633,7 +627,7 @@ mod tests {
     #[ignore]
     #[test]
     fn test_lost_update() {
-        let clock = LocalClock::new();
+        let clock = LocalClock::default();
         let db = Database::new(clock);
 
         // T1 inserts a row with ID 1 and commits.