Skip to content
Snippets Groups Projects
Commit 1fc60694 authored by Hans Moog's avatar Hans Moog
Browse files

Refactor: fixed some issues + refactored

parent 2fc91bfd
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
plugins/gossip/transaction_processor_test.go
+ 0
− 8
View file @ 1fc60694
...@@ -9,11 +9,7 @@ import ( ...@@ -9,11 +9,7 @@ import (
) )
func BenchmarkProcessSimilarTransactionsFiltered(b *testing.B) { 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) byteArray := setupTransaction(meta_transaction.MARSHALLED_TOTAL_SIZE / ternary.NUMBER_OF_TRITS_IN_A_BYTE)
>>>>>>> master
b.ResetTimer() b.ResetTimer()
...@@ -23,11 +19,7 @@ func BenchmarkProcessSimilarTransactionsFiltered(b *testing.B) { ...@@ -23,11 +19,7 @@ func BenchmarkProcessSimilarTransactionsFiltered(b *testing.B) {
} }
func BenchmarkProcessSimilarTransactionsUnfiltered(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) byteArray := setupTransaction(meta_transaction.MARSHALLED_TOTAL_SIZE / ternary.NUMBER_OF_TRITS_IN_A_BYTE)
>>>>>>> master
b.ResetTimer() b.ResetTimer()
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment