Merge branch 'master' into feat/pstore-ds-gc

pstoreds/ds_test.go

@@ -33,8 +33,7 @@ func TestDsPeerstore(t *testing.T) {
 
 func TestDsAddrBook(t *testing.T) {
 	for name, dsFactory := range dstores {
-		t.Run(name, func(t *testing.T) {
+		t.Run(name+" Cacheful", func(t *testing.T) {
-			t.Run("Cacheful", func(t *testing.T) {
 			t.Parallel()
 
 			opts := DefaultOpts()
@@ -44,7 +43,7 @@ func TestDsAddrBook(t *testing.T) {
 			pt.TestAddrBook(t, addressBookFactory(t, dsFactory, opts))
 		})
 
-			t.Run("Cacheless", func(t *testing.T) {
+		t.Run(name+" Cacheless", func(t *testing.T) {
 			t.Parallel()
 
 			opts := DefaultOpts()
@@ -53,7 +52,6 @@ func TestDsAddrBook(t *testing.T) {
 
 			pt.TestAddrBook(t, addressBookFactory(t, dsFactory, opts))
 		})
-		})
 	}
 }
 
@@ -65,6 +63,14 @@ func TestDsKeyBook(t *testing.T) {
 	}
 }
 
+func BenchmarkDsKeyBook(b *testing.B) {
+	for name, dsFactory := range dstores {
+		b.Run(name, func(b *testing.B) {
+			pt.BenchmarkKeyBook(b, keyBookFactory(b, dsFactory, DefaultOpts()))
+		})
+	}
+}
+
 func BenchmarkDsPeerstore(b *testing.B) {
 	caching := DefaultOpts()
 	caching.CacheSize = 1024
@@ -75,6 +81,8 @@ func BenchmarkDsPeerstore(b *testing.B) {
 	for name, dsFactory := range dstores {
 		b.Run(name, func(b *testing.B) {
 			pt.BenchmarkPeerstore(b, peerstoreFactory(b, dsFactory, caching), "Caching")
+		})
+		b.Run(name, func(b *testing.B) {
 			pt.BenchmarkPeerstore(b, peerstoreFactory(b, dsFactory, cacheless), "Cacheless")
 		})
 	}

pstoremem/inmem_test.go

@@ -30,3 +30,9 @@ func BenchmarkInMemoryPeerstore(b *testing.B) {
 		return NewPeerstore(), nil
 	}, "InMem")
 }
+
+func BenchmarkInMemoryKeyBook(b *testing.B) {
+	pt.BenchmarkKeyBook(b, func() (pstore.KeyBook, func()) {
+		return NewKeyBook(), nil
+	})
+}

test/benchmarks_suite.go

@@ -3,6 +3,7 @@ package test
 import (
 	"context"
 	"fmt"
+	"sort"
 	"testing"
 
 	pstore "github.com/libp2p/go-libp2p-peerstore"
@@ -38,7 +39,15 @@ func BenchmarkPeerstore(b *testing.B, factory PeerstoreFactory, variant string)
 		go addressProducer(ctx, b, p.ch, p.n)
 	}
 
-	for name, bench := range peerstoreBenchmarks {
+	// So tests are always run in the same order.
+	ordernames := make([]string, 0, len(peerstoreBenchmarks))
+	for name := range peerstoreBenchmarks {
+		ordernames = append(ordernames, name)
+	}
+	sort.Strings(ordernames)
+
+	for _, name := range ordernames {
+		bench := peerstoreBenchmarks[name]
 		for _, p := range params {
 			// Create a new peerstore.
 			ps, closeFunc := factory()

test/keybook_suite.go

@@ -161,3 +161,144 @@ func testInlinedPubKeyAddedOnRetrieve(kb pstore.KeyBook) func(t *testing.T) {
 		}
 	}
 }
+
+var keybookBenchmarkSuite = map[string]func(kb pstore.KeyBook) func(*testing.B){
+	"PubKey":        benchmarkPubKey,
+	"AddPubKey":     benchmarkAddPubKey,
+	"PrivKey":       benchmarkPrivKey,
+	"AddPrivKey":    benchmarkAddPrivKey,
+	"PeersWithKeys": benchmarkPeersWithKeys,
+}
+
+func BenchmarkKeyBook(b *testing.B, factory KeyBookFactory) {
+	ordernames := make([]string, 0, len(keybookBenchmarkSuite))
+	for name := range keybookBenchmarkSuite {
+		ordernames = append(ordernames, name)
+	}
+	sort.Strings(ordernames)
+	for _, name := range ordernames {
+		bench := keybookBenchmarkSuite[name]
+		kb, closeFunc := factory()
+
+		b.Run(name, bench(kb))
+
+		if closeFunc != nil {
+			closeFunc()
+		}
+	}
+}
+
+func benchmarkPubKey(kb pstore.KeyBook) func(*testing.B) {
+	return func(b *testing.B) {
+		_, pub, err := pt.RandTestKeyPair(512)
+		if err != nil {
+			b.Error(err)
+		}
+
+		id, err := peer.IDFromPublicKey(pub)
+		if err != nil {
+			b.Error(err)
+		}
+
+		err = kb.AddPubKey(id, pub)
+		if err != nil {
+			b.Fatal(err)
+		}
+
+		b.ResetTimer()
+		for i := 0; i < b.N; i++ {
+			kb.PubKey(id)
+		}
+	}
+}
+
+func benchmarkAddPubKey(kb pstore.KeyBook) func(*testing.B) {
+	return func(b *testing.B) {
+		_, pub, err := pt.RandTestKeyPair(512)
+		if err != nil {
+			b.Error(err)
+		}
+
+		id, err := peer.IDFromPublicKey(pub)
+		if err != nil {
+			b.Error(err)
+		}
+
+		b.ResetTimer()
+		for i := 0; i < b.N; i++ {
+			kb.AddPubKey(id, pub)
+		}
+	}
+}
+
+func benchmarkPrivKey(kb pstore.KeyBook) func(*testing.B) {
+	return func(b *testing.B) {
+		priv, _, err := pt.RandTestKeyPair(512)
+		if err != nil {
+			b.Error(err)
+		}
+
+		id, err := peer.IDFromPrivateKey(priv)
+		if err != nil {
+			b.Error(err)
+		}
+
+		err = kb.AddPrivKey(id, priv)
+		if err != nil {
+			b.Fatal(err)
+		}
+
+		b.ResetTimer()
+		for i := 0; i < b.N; i++ {
+			kb.PrivKey(id)
+		}
+	}
+}
+
+func benchmarkAddPrivKey(kb pstore.KeyBook) func(*testing.B) {
+	return func(b *testing.B) {
+		priv, _, err := pt.RandTestKeyPair(512)
+		if err != nil {
+			b.Error(err)
+		}
+
+		id, err := peer.IDFromPrivateKey(priv)
+		if err != nil {
+			b.Error(err)
+		}
+
+		b.ResetTimer()
+		for i := 0; i < b.N; i++ {
+			kb.AddPrivKey(id, priv)
+		}
+	}
+}
+
+func benchmarkPeersWithKeys(kb pstore.KeyBook) func(*testing.B) {
+	return func(b *testing.B) {
+		for i := 0; i < 10; i++ {
+			priv, pub, err := pt.RandTestKeyPair(512)
+			if err != nil {
+				b.Error(err)
+			}
+
+			id, err := peer.IDFromPublicKey(pub)
+			if err != nil {
+				b.Error(err)
+			}
+
+			err = kb.AddPubKey(id, pub)
+			if err != nil {
+				b.Fatal(err)
+			}
+			err = kb.AddPrivKey(id, priv)
+			if err != nil {
+				b.Fatal(err)
+			}
+		}
+		b.ResetTimer()
+		for i := 0; i < b.N; i++ {
+			kb.PeersWithKeys()
+		}
+	}
+}