scriptoriumadmin/featurebase
1
0
Fork 0
mirror of https://github.com/featurebasedb/featurebase.git synced 2026-09-07 00:55:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

don't wrap error, dedup compare transactions code

Browse source
This commit is contained in:
Matt Jaffee 2020-04-20 22:30:14 -05:00
parent b23d27f507
commit 5e29effa93
No known key found for this signature in database
GPG key ID: 08A3DFFF987B11BF
2 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
server.go
View file

@ -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)
}

13
test/transaction.go
View file

@ -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)