From bd1d1c2c7cda01b564a0b921e85c46014d31fbae Mon Sep 17 00:00:00 2001
From: ryyst <ryyst@tuta.io>
Date: Sat, 20 Sep 2025 18:48:48 +0300
Subject: [PATCH] style: minor formatting cleanup in test_conflict.go
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Remove extra trailing space in comment for consistency.

This utility was originally added in commit 138b5ed to create timestamp
collision scenarios for testing the sophisticated conflict resolution
system. The conflict resolution test it enables now passes consistently
after fixing the timestamp collision handling logic.

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 test_conflict.go | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/test_conflict.go b/test_conflict.go
index e6dfe15..5019f2a 100644
--- a/test_conflict.go
+++ b/test_conflict.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package main
@@ -24,33 +25,33 @@ func createConflictingData(dataDir1, dataDir2 string) error {
 	// Same timestamp, different UUIDs
 	timestamp := time.Now().UnixMilli()
 	path := "test/conflict/data"
-	
+
 	// Data for node1
 	data1 := json.RawMessage(`{"message": "from node1", "value": 100}`)
 	uuid1 := uuid.New().String()
-	
+
 	// Data for node2 (same timestamp, different UUID and content)
 	data2 := json.RawMessage(`{"message": "from node2", "value": 200}`)
 	uuid2 := uuid.New().String()
-	
+
 	// Store in node1's database
 	err := storeConflictData(dataDir1, path, timestamp, uuid1, data1)
 	if err != nil {
 		return fmt.Errorf("failed to store in node1: %v", err)
 	}
-	
-	// Store in node2's database  
+
+	// Store in node2's database
 	err = storeConflictData(dataDir2, path, timestamp, uuid2, data2)
 	if err != nil {
 		return fmt.Errorf("failed to store in node2: %v", err)
 	}
-	
+
 	fmt.Printf("Created conflict scenario:\n")
 	fmt.Printf("Path: %s\n", path)
 	fmt.Printf("Timestamp: %d\n", timestamp)
 	fmt.Printf("Node1 UUID: %s, Data: %s\n", uuid1, string(data1))
 	fmt.Printf("Node2 UUID: %s, Data: %s\n", uuid2, string(data2))
-	
+
 	return nil
 }
 
@@ -62,24 +63,24 @@ func storeConflictData(dataDir, path string, timestamp int64, uuid string, data
 		return err
 	}
 	defer db.Close()
-	
+
 	storedValue := StoredValue{
 		UUID:      uuid,
 		Timestamp: timestamp,
 		Data:      data,
 	}
-	
+
 	valueBytes, err := json.Marshal(storedValue)
 	if err != nil {
 		return err
 	}
-	
+
 	return db.Update(func(txn *badger.Txn) error {
 		// Store main data
 		if err := txn.Set([]byte(path), valueBytes); err != nil {
 			return err
 		}
-		
+
 		// Store timestamp index
 		indexKey := fmt.Sprintf("_ts:%020d:%s", timestamp, path)
 		return txn.Set([]byte(indexKey), []byte(uuid))
@@ -91,13 +92,13 @@ func main() {
 		fmt.Println("Usage: go run test_conflict.go <data_dir1> <data_dir2>")
 		os.Exit(1)
 	}
-	
+
 	err := createConflictingData(os.Args[1], os.Args[2])
 	if err != nil {
 		fmt.Printf("Error: %v\n", err)
 		os.Exit(1)
 	}
-	
+
 	fmt.Println("Conflict data created successfully!")
 	fmt.Println("Start your nodes and trigger a sync to see conflict resolution in action.")
-}
\ No newline at end of file
+}