From 1fc60694e995f525eace13ac9bde3a980196d46a Mon Sep 17 00:00:00 2001
From: Hans Moog <hm@mkjc.net>
Date: Mon, 17 Jun 2019 16:35:22 +0200
Subject: [PATCH] Refactor: fixed some issues + refactored
---
plugins/gossip/transaction_processor_test.go | 8 --------
1 file changed, 8 deletions(-)
diff --git a/plugins/gossip/transaction_processor_test.go b/plugins/gossip/transaction_processor_test.go
index 86b6349a..c07602df 100644
--- a/plugins/gossip/transaction_processor_test.go
+++ b/plugins/gossip/transaction_processor_test.go
@@ -9,11 +9,7 @@ import (
)
func BenchmarkProcessSimilarTransactionsFiltered(b *testing.B) {
-<<<<<<< HEAD
- byteArray := setupTransaction(transaction.MARSHALED_TOTAL_SIZE / ternary.NUMBER_OF_TRITS_IN_A_BYTE)
-=======
byteArray := setupTransaction(meta_transaction.MARSHALLED_TOTAL_SIZE / ternary.NUMBER_OF_TRITS_IN_A_BYTE)
->>>>>>> master
b.ResetTimer()
@@ -23,11 +19,7 @@ func BenchmarkProcessSimilarTransactionsFiltered(b *testing.B) {
}
func BenchmarkProcessSimilarTransactionsUnfiltered(b *testing.B) {
-<<<<<<< HEAD
- byteArray := setupTransaction(transaction.MARSHALED_TOTAL_SIZE / ternary.NUMBER_OF_TRITS_IN_A_BYTE)
-=======
byteArray := setupTransaction(meta_transaction.MARSHALLED_TOTAL_SIZE / ternary.NUMBER_OF_TRITS_IN_A_BYTE)
->>>>>>> master
b.ResetTimer()
--
GitLab