Imporve the execution time of light test

Finschia · Dec 23, 2021 · ecf98d0 · ecf98d0
1 parent 433f0cb
commit ecf98d0
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/light/client_benchmark_test.go b/light/client_benchmark_test.go
@@ -5,6 +5,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/line/ostracon/libs/sync"
+
 	"github.com/line/tm-db/v2/memdb"
 
 	"github.com/line/ostracon/libs/log"
@@ -23,11 +25,23 @@ import (
 //
 // Remember that none of these benchmarks account for network latency.
 var (
-	benchmarkFullNode = mockp.New(genMockNode(chainID, 1000, 100, 1, bTime))
-	genesisBlock, _   = benchmarkFullNode.LightBlock(context.Background(), 1)
+	mu sync.Mutex
+	// Shouldn't initialize variables here since affecting test (this is for benchmark test)
+	benchmarkFullNode *mockp.Mock
+	genesisBlock      *types.LightBlock
 )
 
+func setupData() {
+	mu.Lock()
+	defer mu.Unlock()
+	if benchmarkFullNode == nil || genesisBlock == nil {
+		benchmarkFullNode = mockp.New(genMockNode(chainID, 1000, 100, 1, bTime))
+		genesisBlock, _ = benchmarkFullNode.LightBlock(context.Background(), 1)
+	}
+}
+
 func BenchmarkSequence(b *testing.B) {
+	setupData()
 	c, err := light.NewClient(
 		context.Background(),
 		chainID,
@@ -57,6 +71,7 @@ func BenchmarkSequence(b *testing.B) {
 }
 
 func BenchmarkBisection(b *testing.B) {
+	setupData()
 	c, err := light.NewClient(
 		context.Background(),
 		chainID,
@@ -85,6 +100,7 @@ func BenchmarkBisection(b *testing.B) {
 }
 
 func BenchmarkBackwards(b *testing.B) {
+	setupData()
 	trustedBlock, _ := benchmarkFullNode.LightBlock(context.Background(), 0)
 	c, err := light.NewClient(
 		context.Background(),

diff --git a/light/client_test.go b/light/client_test.go
@@ -81,8 +81,7 @@ var (
 		valSet,
 		voterSet,
 	)
-	deadNode      = mockp.NewDeadMock(chainID)
-	largeFullNode = mockp.New(genMockNode(chainID, 10, 3, 0, bTime))
+	deadNode = mockp.NewDeadMock(chainID)
 )
 
 func TestValidateTrustOptions(t *testing.T) {
@@ -923,6 +922,7 @@ func TestClientReplacesPrimaryWithWitnessIfPrimaryIsUnavailable(t *testing.T) {
 }
 
 func TestClient_BackwardsVerification(t *testing.T) {
+	largeFullNode := mockp.New(genMockNode(chainID, 10, 3, 0, bTime))
 	{
 		trustHeader, _ := largeFullNode.LightBlock(ctx, 6)
 		c, err := light.NewClient(