From 5645d1951b329abe4e0b0fa2d11fbaac727bc7ee Mon Sep 17 00:00:00 2001
From: ChronosX88 <chronosx88@gmail.com>
Date: Sun, 11 Jul 2021 01:07:04 +0300
Subject: [PATCH] Fix some typos

---
 blockchain/types/transaction.go |   5 +-
 node/network_service.go         |   2 +-
 types/electionproof_test.go     | 145 --------------------------------
 3 files changed, 2 insertions(+), 150 deletions(-)
 delete mode 100644 types/electionproof_test.go

diff --git a/blockchain/types/transaction.go b/blockchain/types/transaction.go
index abb4c6d..f892c66 100644
--- a/blockchain/types/transaction.go
+++ b/blockchain/types/transaction.go
@@ -31,8 +31,5 @@ func CreateTransaction(data []byte) *Transaction {
 
 func (tx *Transaction) ValidateHash() bool {
 	h := crypto.Keccak256([]byte(fmt.Sprintf("%d_%s", tx.Timestamp.Unix(), tx.Hash)))
-	if bytes.Compare(h, tx.Hash) != 0 {
-		return false
-	}
-	return true
+	return bytes.Equal(h, tx.Hash)
 }
diff --git a/node/network_service.go b/node/network_service.go
index a5afb42..5b44b9a 100644
--- a/node/network_service.go
+++ b/node/network_service.go
@@ -73,7 +73,7 @@ func (s *NetworkService) Mempool(ctx context.Context, arg struct{}, reply *wire.
 }
 
 func (s *NetworkService) GetMempoolTxs(ctx context.Context, arg wire.GetMempoolTxsArg, reply *wire.GetMempoolTxsReply) {
-	if len(arg.Items) > MaxTransactionCountForRetrieving {
+	if len(arg.Items) > policy.MaxTransactionCountForRetrieving {
 		pid, _ := gorpc.GetRequestSender(ctx)
 		logrus.Warnf("Max tx count limit exceeded for GetMempoolTxs request of node %s", pid)
 		reply.Error = fmt.Errorf("max tx count limit exceeded")
diff --git a/types/electionproof_test.go b/types/electionproof_test.go
deleted file mode 100644
index 47f684e..0000000
--- a/types/electionproof_test.go
+++ /dev/null
@@ -1,145 +0,0 @@
-package types
-
-import (
-	"bytes"
-	"fmt"
-	"math/big"
-	"os"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/xorcare/golden"
-)
-
-func TestPoissonFunction(t *testing.T) {
-	tests := []struct {
-		lambdaBase  uint64
-		lambdaShift uint
-	}{
-		{10, 10},      // 0.0097
-		{209714, 20},  // 0.19999885
-		{1036915, 20}, // 0.9888792038
-		{1706, 10},    // 1.6660
-		{2, 0},        // 2
-		{5242879, 20}, //4.9999990
-		{5, 0},        // 5
-	}
-
-	for _, test := range tests {
-		test := test
-		t.Run(fmt.Sprintf("lam-%d-%d", test.lambdaBase, test.lambdaShift), func(t *testing.T) {
-			b := &bytes.Buffer{}
-			b.WriteString("icdf\n")
-
-			lam := new(big.Int).SetUint64(test.lambdaBase)
-			lam = lam.Lsh(lam, precision-test.lambdaShift)
-			p, icdf := newPoiss(lam)
-
-			b.WriteString(icdf.String())
-			b.WriteRune('\n')
-
-			for i := 0; i < 15; i++ {
-				b.WriteString(p.next().String())
-				b.WriteRune('\n')
-			}
-			golden.Assert(t, b.Bytes())
-		})
-	}
-}
-
-func TestLambdaFunction(t *testing.T) {
-	tests := []struct {
-		power      string
-		totalPower string
-		target     float64
-	}{
-		{"10", "100", .1 * 5.},
-		{"1024", "2048", 0.5 * 5.},
-		{"2000000000000000", "100000000000000000", 0.02 * 5.},
-	}
-
-	for _, test := range tests {
-		test := test
-		t.Run(fmt.Sprintf("%s-%s", test.power, test.totalPower), func(t *testing.T) {
-			pow, ok := new(big.Int).SetString(test.power, 10)
-			assert.True(t, ok)
-			total, ok := new(big.Int).SetString(test.totalPower, 10)
-			assert.True(t, ok)
-			lam := lambda(pow, total)
-			assert.Equal(t, test.target, q256ToF(lam))
-			golden.Assert(t, []byte(lam.String()))
-		})
-	}
-}
-
-func TestExpFunction(t *testing.T) {
-	const N = 256
-
-	step := big.NewInt(5)
-	step = step.Lsh(step, 256) // Q.256
-	step = step.Div(step, big.NewInt(N-1))
-
-	x := big.NewInt(0)
-	b := &bytes.Buffer{}
-
-	b.WriteString("x, y\n")
-	for i := 0; i < N; i++ {
-		y := expneg(x)
-		fmt.Fprintf(b, "%s,%s\n", x, y)
-		x = x.Add(x, step)
-	}
-
-	golden.Assert(t, b.Bytes())
-}
-
-func q256ToF(x *big.Int) float64 {
-	deno := big.NewInt(1)
-	deno = deno.Lsh(deno, 256)
-	rat := new(big.Rat).SetFrac(x, deno)
-	f, _ := rat.Float64()
-	return f
-}
-
-func TestElectionLam(t *testing.T) {
-	p := big.NewInt(64)
-	tot := big.NewInt(128)
-	lam := lambda(p, tot)
-	target := 64. * 5. / 128.
-	if q256ToF(lam) != target {
-		t.Fatalf("wrong lambda: %f, should be: %f", q256ToF(lam), target)
-	}
-}
-
-var Res int64
-
-func BenchmarkWinCounts(b *testing.B) {
-	totalPower := NewInt(100)
-	power := NewInt(100)
-	ep := &ElectionProof{VRFProof: nil}
-	var res int64
-
-	b.ResetTimer()
-	b.ReportAllocs()
-	for i := 0; i < b.N; i++ {
-		ep.VRFProof = []byte{byte(i), byte(i >> 8), byte(i >> 16), byte(i >> 24), byte(i >> 32)}
-		j := ep.ComputeWinCount(power, totalPower)
-		res += j
-	}
-	Res += res
-}
-
-func TestWinCounts(t *testing.T) {
-	t.SkipNow()
-	totalPower := NewInt(100)
-	power := NewInt(30)
-
-	f, _ := os.Create("output.wins")
-	fmt.Fprintf(f, "wins\n")
-	ep := &ElectionProof{VRFProof: nil}
-	for i := uint64(0); i < 1000000; i++ {
-		i := i + 1000000
-		ep.VRFProof = []byte{byte(i), byte(i >> 8), byte(i >> 16), byte(i >> 24), byte(i >> 32)}
-		j := ep.ComputeWinCount(power, totalPower)
-		fmt.Fprintf(f, "%d\n", j)
-	}
-}