Changed benchmark structure

dedis · Mar 10, 2024 · 72086f9 · 72086f9
1 parent d8f6f67
commit 72086f9
Show file tree

Hide file tree

Showing 24 changed files with 5 additions and 45 deletions.
diff --git a/Makefile b/Makefile
@@ -25,7 +25,3 @@ coverage: tidy
 # pushing code
 check: lint vet test
 	echo "check done"
-
-benchmark: tidy
-	chmod +x benchmark/run.sh
-	cd benchmark && ./run.sh
diff --git a/benchmark/.gitignore b/benchmark/.gitignore
diff --git a/benchmark/bls/benchmark.sh b/benchmark/bls/benchmark.sh
diff --git a/benchmark/run.sh b/benchmark/run.sh
diff --git a/benchmark/bls/benchmark_test.go → pairing/bls12381/bls12381_test.go b/benchmark/bls/benchmark_test.go → pairing/bls12381/bls12381_test.go
@@ -1,5 +1,4 @@
-// Forked from https://github.com/matejpavlovic/bls-bench
-package benchmark
+package bls12381
 
 import (
 	"crypto/rand"
@@ -8,8 +7,8 @@ import (
 
 	"go.dedis.ch/kyber/v3"
 	"go.dedis.ch/kyber/v3/pairing"
-	circlBls12381 "go.dedis.ch/kyber/v3/pairing/circl_bls12381"
-	kilicBls12381 "go.dedis.ch/kyber/v3/pairing/kilic_bls12381"
+	circlBls12381 "go.dedis.ch/kyber/v3/pairing/bls12381/circl_bls12381"
+	kilicBls12381 "go.dedis.ch/kyber/v3/pairing/bls12381/kilic_bls12381"
 	"go.dedis.ch/kyber/v3/sign/bls"
 	"go.dedis.ch/kyber/v3/util/random"
 )

diff --git a/pairing/circl_bls12381/adapter.go → pairing/bls12381/circl_bls12381/adapter.go b/pairing/circl_bls12381/adapter.go → pairing/bls12381/circl_bls12381/adapter.go
diff --git a/pairing/circl_bls12381/adapter_test.go → ...g/bls12381/circl_bls12381/adapter_test.go b/pairing/circl_bls12381/adapter_test.go → ...g/bls12381/circl_bls12381/adapter_test.go
diff --git a/pairing/circl_bls12381/g1.go → pairing/bls12381/circl_bls12381/g1.go b/pairing/circl_bls12381/g1.go → pairing/bls12381/circl_bls12381/g1.go
diff --git a/pairing/circl_bls12381/g2.go → pairing/bls12381/circl_bls12381/g2.go b/pairing/circl_bls12381/g2.go → pairing/bls12381/circl_bls12381/g2.go
diff --git a/pairing/circl_bls12381/group.go → pairing/bls12381/circl_bls12381/group.go b/pairing/circl_bls12381/group.go → pairing/bls12381/circl_bls12381/group.go
diff --git a/pairing/circl_bls12381/gt.go → pairing/bls12381/circl_bls12381/gt.go b/pairing/circl_bls12381/gt.go → pairing/bls12381/circl_bls12381/gt.go
diff --git a/pairing/circl_bls12381/scalar.go → pairing/bls12381/circl_bls12381/scalar.go b/pairing/circl_bls12381/scalar.go → pairing/bls12381/circl_bls12381/scalar.go
diff --git a/pairing/circl_bls12381/suite.go → pairing/bls12381/circl_bls12381/suite.go b/pairing/circl_bls12381/suite.go → pairing/bls12381/circl_bls12381/suite.go
diff --git a/pairing/circl_bls12381/suite_test.go → ...ing/bls12381/circl_bls12381/suite_test.go b/pairing/circl_bls12381/suite_test.go → ...ing/bls12381/circl_bls12381/suite_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 	"go.dedis.ch/kyber/v3"
-	this "go.dedis.ch/kyber/v3/pairing/circl_bls12381"
+	this "go.dedis.ch/kyber/v3/pairing/bls12381/circl_bls12381"
 	"go.dedis.ch/kyber/v3/sign/bls"
 	"go.dedis.ch/kyber/v3/sign/tbls"
 	"go.dedis.ch/kyber/v3/sign/test"

diff --git a/pairing/kilic_bls12381/adapter.go → pairing/bls12381/kilic_bls12381/adapter.go b/pairing/kilic_bls12381/adapter.go → pairing/bls12381/kilic_bls12381/adapter.go
diff --git a/pairing/kilic_bls12381/adapter_test.go → ...g/bls12381/kilic_bls12381/adapter_test.go b/pairing/kilic_bls12381/adapter_test.go → ...g/bls12381/kilic_bls12381/adapter_test.go
diff --git a/pairing/kilic_bls12381/g1.go → pairing/bls12381/kilic_bls12381/g1.go b/pairing/kilic_bls12381/g1.go → pairing/bls12381/kilic_bls12381/g1.go
diff --git a/pairing/kilic_bls12381/g2.go → pairing/bls12381/kilic_bls12381/g2.go b/pairing/kilic_bls12381/g2.go → pairing/bls12381/kilic_bls12381/g2.go
diff --git a/pairing/kilic_bls12381/group.go → pairing/bls12381/kilic_bls12381/group.go b/pairing/kilic_bls12381/group.go → pairing/bls12381/kilic_bls12381/group.go
diff --git a/pairing/kilic_bls12381/gt.go → pairing/bls12381/kilic_bls12381/gt.go b/pairing/kilic_bls12381/gt.go → pairing/bls12381/kilic_bls12381/gt.go
diff --git a/pairing/kilic_bls12381/scalar.go → pairing/bls12381/kilic_bls12381/scalar.go b/pairing/kilic_bls12381/scalar.go → pairing/bls12381/kilic_bls12381/scalar.go
diff --git a/pairing/kilic_bls12381/suite.go → pairing/bls12381/kilic_bls12381/suite.go b/pairing/kilic_bls12381/suite.go → pairing/bls12381/kilic_bls12381/suite.go
diff --git a/pairing/kilic_bls12381/suite_test.go → ...ing/bls12381/kilic_bls12381/suite_test.go b/pairing/kilic_bls12381/suite_test.go → ...ing/bls12381/kilic_bls12381/suite_test.go
diff --git a/sign/test/bls_test.go b/sign/test/bls_test.go
@@ -3,7 +3,7 @@ package test
 import (
 	"testing"
 
-	bls "go.dedis.ch/kyber/v3/pairing/kilic_bls12381"
+	bls "go.dedis.ch/kyber/v3/pairing/bls12381/kilic_bls12381"
 	sign "go.dedis.ch/kyber/v3/sign/bls"
 )