From 7f8c8710e0d69542362bd20193138d6077c314bb Mon Sep 17 00:00:00 2001
From: Sergey Matveev <stargrave@stargrave.org>
Date: Mon, 14 Sep 2015 09:49:25 +0300
Subject: [PATCH] Fixed benchmark tests

Signed-off-by: Sergey Matveev <stargrave@stargrave.org>
---
 src/govpn/{transport_test.go => peer_test.go} | 22 ++++++-------------
 1 file changed, 7 insertions(+), 15 deletions(-)
 rename src/govpn/{transport_test.go => peer_test.go} (76%)

diff --git a/src/govpn/transport_test.go b/src/govpn/peer_test.go
similarity index 76%
rename from src/govpn/transport_test.go
rename to src/govpn/peer_test.go
index f9f731e..9bad8c6 100644
--- a/src/govpn/transport_test.go
+++ b/src/govpn/peer_test.go
@@ -8,7 +8,6 @@ import (
 var (
 	peer       *Peer
 	plaintext  []byte
-	ready      chan struct{}
 	ciphertext []byte
 	peerId     *PeerId
 	conf       *PeerConf
@@ -25,10 +24,6 @@ func (d Dummy) Write(b []byte) (int, error) {
 	return len(b), nil
 }
 
-func (d Dummy) Reorderable() bool {
-	return true
-}
-
 func init() {
 	MTU = 1500
 	peerId, _ = IDDecode("ffffffffffffffffffffffffffffffff")
@@ -40,30 +35,27 @@ func init() {
 	}
 	peer = newPeer(true, "foo", Dummy{&ciphertext}, conf, new([SSize]byte))
 	plaintext = make([]byte, 789)
-	ready = make(chan struct{})
-	go func() {
-		for {
-			<-ready
-		}
-	}()
 }
 
 func BenchmarkEnc(b *testing.B) {
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
-		peer.NonceOur = 128
-		peer.EthProcess(plaintext, ready)
+		peer.EthProcess(plaintext)
 	}
 }
 
 func BenchmarkDec(b *testing.B) {
-	peer.EthProcess(plaintext, ready)
+	peer = newPeer(true, "foo", Dummy{&ciphertext}, conf, new([SSize]byte))
+	peer.EthProcess(plaintext)
 	peer = newPeer(true, "foo", Dummy{nil}, conf, new([SSize]byte))
+	orig := make([]byte, len(ciphertext))
+	copy(orig, ciphertext)
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
 		peer.nonceBucket0 = make(map[uint64]struct{}, 1)
 		peer.nonceBucket1 = make(map[uint64]struct{}, 1)
-		if !peer.PktProcess(ciphertext, Dummy{nil}, ready) {
+		copy(ciphertext, orig)
+		if !peer.PktProcess(ciphertext, Dummy{nil}, true) {
 			b.Fail()
 		}
 	}
-- 
2.48.1