From 5e29effa93dbfc16df437896b8c9e3add5e137ef Mon Sep 17 00:00:00 2001
From: Matt Jaffee <matthew.jaffee@gmail.com>
Date: Mon, 20 Apr 2020 22:30:14 -0500
Subject: [PATCH] don't wrap error, dedup compare transactions code

---
 server.go           |  3 +--
 test/transaction.go | 13 ++-----------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/server.go b/server.go
index b1b25dbe1..9621450d3 100644
--- a/server.go
+++ b/server.go
@@ -825,8 +825,7 @@ func (s *Server) handleTransactionMessage(tm *TransactionMessage) error {
 		if err != nil {
 			return errors.Wrap(err, "getting local transaction to validate")
 		}
-		err = CompareTransactions(mtrns, trns)
-		return errors.Wrap(err, "comparing transactions")
+		return CompareTransactions(mtrns, trns)
 	default:
 		return errors.Errorf("unknown transaction action: '%s'", tm.Action)
 	}
diff --git a/test/transaction.go b/test/transaction.go
index 8ff6c7f74..53dadfce1 100644
--- a/test/transaction.go
+++ b/test/transaction.go
@@ -28,17 +28,8 @@ const deadlineSkew = time.Millisecond * 10
 // (within deadlineSkew).
 func CompareTransactions(t *testing.T, trns1, trns2 pilosa.Transaction) {
 	t.Helper()
-	if trns1.ID != trns2.ID {
-		t.Errorf("IDs differ:\n%+v\n%+v", trns1, trns2)
-	}
-	if trns1.Active != trns2.Active {
-		t.Errorf("Actives differ:\n%+v\n%+v", trns1, trns2)
-	}
-	if trns1.Exclusive != trns2.Exclusive {
-		t.Errorf("Exclusives differ:\n%+v\n%+v", trns1, trns2)
-	}
-	if trns1.Timeout != trns2.Timeout {
-		t.Errorf("Timeouts differ:\n%+v\n%+v", trns1, trns2)
+	if err := pilosa.CompareTransactions(trns1, trns2); err != nil {
+		t.Errorf("%v", err)
 	}
 
 	diff := trns1.Deadline.Sub(trns2.Deadline)