p2p/dnsdisc: fix tests with Go 1.20 (#26690)
This commit is contained in:
Felix Lange
GitHub
parent
ff38c9ee2e
commit
101587b3f4
@ -20,12 +20,12 @@ import (
|
||||
"context"
|
||||
"crypto/ecdsa"
|
||||
"errors"
|
||||
"math/rand"
|
||||
"reflect"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/davecgh/go-spew/spew"
|
||||
"github.com/ethereum/go-ethereum/common/hexutil"
|
||||
"github.com/ethereum/go-ethereum/common/mclock"
|
||||
"github.com/ethereum/go-ethereum/crypto"
|
||||
"github.com/ethereum/go-ethereum/internal/testlog"
|
||||
@ -34,23 +34,25 @@ import (
|
||||
"github.com/ethereum/go-ethereum/p2p/enr"
|
||||
)
|
||||
|
||||
const (
|
||||
signingKeySeed = 0x111111
|
||||
nodesSeed1 = 0x2945237
|
||||
nodesSeed2 = 0x4567299
|
||||
)
|
||||
var signingKeyForTesting, _ = crypto.ToECDSA(hexutil.MustDecode("0xdc599867fc513f8f5e2c2c9c489cde5e71362d1d9ec6e693e0de063236ed1240"))
|
||||
|
||||
func TestClientSyncTree(t *testing.T) {
|
||||
nodes := []string{
|
||||
"enr:-HW4QOFzoVLaFJnNhbgMoDXPnOvcdVuj7pDpqRvh6BRDO68aVi5ZcjB3vzQRZH2IcLBGHzo8uUN3snqmgTiE56CH3AMBgmlkgnY0iXNlY3AyNTZrMaECC2_24YYkYHEgdzxlSNKQEnHhuNAbNlMlWJxrJxbAFvA",
|
||||
"enr:-HW4QAggRauloj2SDLtIHN1XBkvhFZ1vtf1raYQp9TBW2RD5EEawDzbtSmlXUfnaHcvwOizhVYLtr7e6vw7NAf6mTuoCgmlkgnY0iXNlY3AyNTZrMaECjrXI8TLNXU0f8cthpAMxEshUyQlK-AM0PW2wfrnacNI",
|
||||
"enr:-HW4QLAYqmrwllBEnzWWs7I5Ev2IAs7x_dZlbYdRdMUx5EyKHDXp7AV5CkuPGUPdvbv1_Ms1CPfhcGCvSElSosZmyoqAgmlkgnY0iXNlY3AyNTZrMaECriawHKWdDRk2xeZkrOXBQ0dfMFLHY4eENZwdufn1S1o",
|
||||
}
|
||||
|
||||
r := mapResolver{
|
||||
"n": "enrtree-root:v1 e=JWXYDBPXYWG6FX3GMDIBFA6CJ4 l=C7HRFPF3BLGF3YR4DY5KX3SMBE seq=1 sig=o908WmNp7LibOfPsr4btQwatZJ5URBr2ZAuxvK4UWHlsB9sUOTJQaGAlLPVAhM__XJesCHxLISo94z5Z2a463gA",
|
||||
"C7HRFPF3BLGF3YR4DY5KX3SMBE.n": "enrtree://AM5FCQLWIZX2QFPNJAP7VUERCCRNGRHWZG3YYHIUV7BVDQ5FDPRT2@morenodes.example.org",
|
||||
"JWXYDBPXYWG6FX3GMDIBFA6CJ4.n": "enrtree-branch:2XS2367YHAXJFGLZHVAWLQD4ZY,H4FHT4B454P6UXFD7JCYQ5PWDY,MHTDO6TMUBRIA2XWG5LUDACK24",
|
||||
"2XS2367YHAXJFGLZHVAWLQD4ZY.n": "enr:-HW4QOFzoVLaFJnNhbgMoDXPnOvcdVuj7pDpqRvh6BRDO68aVi5ZcjB3vzQRZH2IcLBGHzo8uUN3snqmgTiE56CH3AMBgmlkgnY0iXNlY3AyNTZrMaECC2_24YYkYHEgdzxlSNKQEnHhuNAbNlMlWJxrJxbAFvA",
|
||||
"H4FHT4B454P6UXFD7JCYQ5PWDY.n": "enr:-HW4QAggRauloj2SDLtIHN1XBkvhFZ1vtf1raYQp9TBW2RD5EEawDzbtSmlXUfnaHcvwOizhVYLtr7e6vw7NAf6mTuoCgmlkgnY0iXNlY3AyNTZrMaECjrXI8TLNXU0f8cthpAMxEshUyQlK-AM0PW2wfrnacNI",
|
||||
"MHTDO6TMUBRIA2XWG5LUDACK24.n": "enr:-HW4QLAYqmrwllBEnzWWs7I5Ev2IAs7x_dZlbYdRdMUx5EyKHDXp7AV5CkuPGUPdvbv1_Ms1CPfhcGCvSElSosZmyoqAgmlkgnY0iXNlY3AyNTZrMaECriawHKWdDRk2xeZkrOXBQ0dfMFLHY4eENZwdufn1S1o",
|
||||
"2XS2367YHAXJFGLZHVAWLQD4ZY.n": nodes[0],
|
||||
"H4FHT4B454P6UXFD7JCYQ5PWDY.n": nodes[1],
|
||||
"MHTDO6TMUBRIA2XWG5LUDACK24.n": nodes[2],
|
||||
}
|
||||
var (
|
||||
wantNodes = testNodes(0x29452, 3)
|
||||
wantNodes = sortByID(parseNodes(nodes))
|
||||
wantLinks = []string{"enrtree://AM5FCQLWIZX2QFPNJAP7VUERCCRNGRHWZG3YYHIUV7BVDQ5FDPRT2@morenodes.example.org"}
|
||||
wantSeq = uint(1)
|
||||
)
|
||||
@ -60,7 +62,7 @@ func TestClientSyncTree(t *testing.T) {
|
||||
if err != nil {
|
||||
t.Fatal("sync error:", err)
|
||||
}
|
||||
if !reflect.DeepEqual(sortByID(stree.Nodes()), sortByID(wantNodes)) {
|
||||
if !reflect.DeepEqual(sortByID(stree.Nodes()), wantNodes) {
|
||||
t.Errorf("wrong nodes in synced tree:\nhave %v\nwant %v", spew.Sdump(stree.Nodes()), spew.Sdump(wantNodes))
|
||||
}
|
||||
if !reflect.DeepEqual(stree.Links(), wantLinks) {
|
||||
@ -80,7 +82,7 @@ func TestClientSyncTreeBadNode(t *testing.T) {
|
||||
// tree, _ := MakeTree(3, nil, []string{"enrtree://AM5FCQLWIZX2QFPNJAP7VUERCCRNGRHWZG3YYHIUV7BVDQ5FDPRT2@morenodes.example.org"})
|
||||
// tree.entries[badHash] = &b
|
||||
// tree.root.eroot = badHash
|
||||
// url, _ := tree.Sign(testKey(signingKeySeed), "n")
|
||||
// url, _ := tree.Sign(signingKeyForTesting, "n")
|
||||
// fmt.Println(url)
|
||||
// fmt.Printf("%#v\n", tree.ToTXT("n"))
|
||||
|
||||
@ -99,9 +101,13 @@ func TestClientSyncTreeBadNode(t *testing.T) {
|
||||
|
||||
// This test checks that randomIterator finds all entries.
|
||||
func TestIterator(t *testing.T) {
|
||||
nodes := testNodes(nodesSeed1, 30)
|
||||
tree, url := makeTestTree("n", nodes, nil)
|
||||
r := mapResolver(tree.ToTXT("n"))
|
||||
var (
|
||||
keys = testKeys(30)
|
||||
nodes = testNodes(keys)
|
||||
tree, url = makeTestTree("n", nodes, nil)
|
||||
r = mapResolver(tree.ToTXT("n"))
|
||||
)
|
||||
|
||||
c := NewClient(Config{
|
||||
Resolver: r,
|
||||
Logger: testlog.Logger(t, log.LvlTrace),
|
||||
@ -132,8 +138,12 @@ func TestIteratorCloseWithoutNext(t *testing.T) {
|
||||
|
||||
// This test checks if closing randomIterator races.
|
||||
func TestIteratorClose(t *testing.T) {
|
||||
nodes := testNodes(nodesSeed1, 500)
|
||||
tree1, url1 := makeTestTree("t1", nodes, nil)
|
||||
var (
|
||||
keys = testKeys(500)
|
||||
nodes = testNodes(keys)
|
||||
tree1, url1 = makeTestTree("t1", nodes, nil)
|
||||
)
|
||||
|
||||
c := NewClient(Config{Resolver: newMapResolver(tree1.ToTXT("t1"))})
|
||||
it, err := c.NewIterator(url1)
|
||||
if err != nil {
|
||||
@ -155,9 +165,13 @@ func TestIteratorClose(t *testing.T) {
|
||||
|
||||
// This test checks that randomIterator traverses linked trees as well as explicitly added trees.
|
||||
func TestIteratorLinks(t *testing.T) {
|
||||
nodes := testNodes(nodesSeed1, 40)
|
||||
tree1, url1 := makeTestTree("t1", nodes[:10], nil)
|
||||
tree2, url2 := makeTestTree("t2", nodes[10:], []string{url1})
|
||||
var (
|
||||
keys = testKeys(40)
|
||||
nodes = testNodes(keys)
|
||||
tree1, url1 = makeTestTree("t1", nodes[:10], nil)
|
||||
tree2, url2 = makeTestTree("t2", nodes[10:], []string{url1})
|
||||
)
|
||||
|
||||
c := NewClient(Config{
|
||||
Resolver: newMapResolver(tree1.ToTXT("t1"), tree2.ToTXT("t2")),
|
||||
Logger: testlog.Logger(t, log.LvlTrace),
|
||||
@ -176,7 +190,8 @@ func TestIteratorLinks(t *testing.T) {
|
||||
func TestIteratorNodeUpdates(t *testing.T) {
|
||||
var (
|
||||
clock = new(mclock.Simulated)
|
||||
nodes = testNodes(nodesSeed1, 30)
|
||||
keys = testKeys(30)
|
||||
nodes = testNodes(keys)
|
||||
resolver = newMapResolver()
|
||||
c = NewClient(Config{
|
||||
Resolver: resolver,
|
||||
@ -197,7 +212,7 @@ func TestIteratorNodeUpdates(t *testing.T) {
|
||||
checkIterator(t, it, nodes[:25])
|
||||
|
||||
// Ensure RandomNode returns the new nodes after the tree is updated.
|
||||
updateSomeNodes(nodesSeed1, nodes)
|
||||
updateSomeNodes(keys, nodes)
|
||||
tree2, _ := makeTestTree("n", nodes, nil)
|
||||
resolver.clear()
|
||||
resolver.add(tree2.ToTXT("n"))
|
||||
@ -213,7 +228,8 @@ func TestIteratorNodeUpdates(t *testing.T) {
|
||||
func TestIteratorRootRecheckOnFail(t *testing.T) {
|
||||
var (
|
||||
clock = new(mclock.Simulated)
|
||||
nodes = testNodes(nodesSeed1, 30)
|
||||
keys = testKeys(30)
|
||||
nodes = testNodes(keys)
|
||||
resolver = newMapResolver()
|
||||
c = NewClient(Config{
|
||||
Resolver: resolver,
|
||||
@ -237,7 +253,7 @@ func TestIteratorRootRecheckOnFail(t *testing.T) {
|
||||
checkIterator(t, it, nodes[:25])
|
||||
|
||||
// Ensure RandomNode returns the new nodes after the tree is updated.
|
||||
updateSomeNodes(nodesSeed1, nodes)
|
||||
updateSomeNodes(keys, nodes)
|
||||
tree2, _ := makeTestTree("n", nodes, nil)
|
||||
resolver.clear()
|
||||
resolver.add(tree2.ToTXT("n"))
|
||||
@ -250,7 +266,8 @@ func TestIteratorRootRecheckOnFail(t *testing.T) {
|
||||
func TestIteratorEmptyTree(t *testing.T) {
|
||||
var (
|
||||
clock = new(mclock.Simulated)
|
||||
nodes = testNodes(nodesSeed1, 1)
|
||||
keys = testKeys(1)
|
||||
nodes = testNodes(keys)
|
||||
resolver = newMapResolver()
|
||||
c = NewClient(Config{
|
||||
Resolver: resolver,
|
||||
@ -294,8 +311,7 @@ func TestIteratorEmptyTree(t *testing.T) {
|
||||
}
|
||||
|
||||
// updateSomeNodes applies ENR updates to some of the given nodes.
|
||||
func updateSomeNodes(keySeed int64, nodes []*enode.Node) {
|
||||
keys := testKeys(nodesSeed1, len(nodes))
|
||||
func updateSomeNodes(keys []*ecdsa.PrivateKey, nodes []*enode.Node) {
|
||||
for i, n := range nodes[:len(nodes)/2] {
|
||||
r := n.Record()
|
||||
r.Set(enr.IP{127, 0, 0, 1})
|
||||
@ -311,7 +327,8 @@ func updateSomeNodes(keySeed int64, nodes []*enode.Node) {
|
||||
func TestIteratorLinkUpdates(t *testing.T) {
|
||||
var (
|
||||
clock = new(mclock.Simulated)
|
||||
nodes = testNodes(nodesSeed1, 30)
|
||||
keys = testKeys(30)
|
||||
nodes = testNodes(keys)
|
||||
resolver = newMapResolver()
|
||||
c = NewClient(Config{
|
||||
Resolver: resolver,
|
||||
@ -384,7 +401,7 @@ func makeTestTree(domain string, nodes []*enode.Node, links []string) (*Tree, st
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
url, err := tree.Sign(testKey(signingKeySeed), domain)
|
||||
url, err := tree.Sign(signingKeyForTesting, domain)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
@ -392,11 +409,10 @@ func makeTestTree(domain string, nodes []*enode.Node, links []string) (*Tree, st
|
||||
}
|
||||
|
||||
// testKeys creates deterministic private keys for testing.
|
||||
func testKeys(seed int64, n int) []*ecdsa.PrivateKey {
|
||||
rand := rand.New(rand.NewSource(seed))
|
||||
func testKeys(n int) []*ecdsa.PrivateKey {
|
||||
keys := make([]*ecdsa.PrivateKey, n)
|
||||
for i := 0; i < n; i++ {
|
||||
key, err := ecdsa.GenerateKey(crypto.S256(), rand)
|
||||
key, err := crypto.GenerateKey()
|
||||
if err != nil {
|
||||
panic("can't generate key: " + err.Error())
|
||||
}
|
||||
@ -405,13 +421,8 @@ func testKeys(seed int64, n int) []*ecdsa.PrivateKey {
|
||||
return keys
|
||||
}
|
||||
|
||||
func testKey(seed int64) *ecdsa.PrivateKey {
|
||||
return testKeys(seed, 1)[0]
|
||||
}
|
||||
|
||||
func testNodes(seed int64, n int) []*enode.Node {
|
||||
keys := testKeys(seed, n)
|
||||
nodes := make([]*enode.Node, n)
|
||||
func testNodes(keys []*ecdsa.PrivateKey) []*enode.Node {
|
||||
nodes := make([]*enode.Node, len(keys))
|
||||
for i, key := range keys {
|
||||
record := new(enr.Record)
|
||||
record.SetSeq(uint64(i))
|
||||
@ -425,10 +436,6 @@ func testNodes(seed int64, n int) []*enode.Node {
|
||||
return nodes
|
||||
}
|
||||
|
||||
func testNode(seed int64) *enode.Node {
|
||||
return testNodes(seed, 1)[0]
|
||||
}
|
||||
|
||||
type mapResolver map[string]string
|
||||
|
||||
func newMapResolver(maps ...map[string]string) mapResolver {
|
||||
@ -457,3 +464,15 @@ func (mr mapResolver) LookupTXT(ctx context.Context, name string) ([]string, err
|
||||
}
|
||||
return nil, errors.New("not found")
|
||||
}
|
||||
|
||||
func parseNodes(rec []string) []*enode.Node {
|
||||
var ns []*enode.Node
|
||||
for _, r := range rec {
|
||||
var n enode.Node
|
||||
if err := n.UnmarshalText([]byte(r)); err != nil {
|
||||
panic(err)
|
||||
}
|
||||
ns = append(ns, &n)
|
||||
}
|
||||
return ns
|
||||
}
|
||||
|
||||
@ -61,7 +61,9 @@ func TestParseRoot(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestParseEntry(t *testing.T) {
|
||||
testkey := testKey(signingKeySeed)
|
||||
testENRs := []string{"enr:-HW4QES8QIeXTYlDzbfr1WEzE-XKY4f8gJFJzjJL-9D7TC9lJb4Z3JPRRz1lP4pL_N_QpT6rGQjAU9Apnc-C1iMP36OAgmlkgnY0iXNlY3AyNTZrMaED5IdwfMxdmR8W37HqSFdQLjDkIwBd4Q_MjxgZifgKSdM"}
|
||||
testNodes := parseNodes(testENRs)
|
||||
|
||||
tests := []struct {
|
||||
input string
|
||||
e entry
|
||||
@ -91,7 +93,11 @@ func TestParseEntry(t *testing.T) {
|
||||
// Links
|
||||
{
|
||||
input: "enrtree://AKPYQIUQIL7PSIACI32J7FGZW56E5FKHEFCCOFHILBIMW3M6LWXS2@nodes.example.org",
|
||||
e: &linkEntry{"AKPYQIUQIL7PSIACI32J7FGZW56E5FKHEFCCOFHILBIMW3M6LWXS2@nodes.example.org", "nodes.example.org", &testkey.PublicKey},
|
||||
e: &linkEntry{
|
||||
str: "AKPYQIUQIL7PSIACI32J7FGZW56E5FKHEFCCOFHILBIMW3M6LWXS2@nodes.example.org",
|
||||
domain: "nodes.example.org",
|
||||
pubkey: &signingKeyForTesting.PublicKey,
|
||||
},
|
||||
},
|
||||
{
|
||||
input: "enrtree://nodes.example.org",
|
||||
@ -107,8 +113,8 @@ func TestParseEntry(t *testing.T) {
|
||||
},
|
||||
// ENRs
|
||||
{
|
||||
input: "enr:-HW4QES8QIeXTYlDzbfr1WEzE-XKY4f8gJFJzjJL-9D7TC9lJb4Z3JPRRz1lP4pL_N_QpT6rGQjAU9Apnc-C1iMP36OAgmlkgnY0iXNlY3AyNTZrMaED5IdwfMxdmR8W37HqSFdQLjDkIwBd4Q_MjxgZifgKSdM",
|
||||
e: &enrEntry{node: testNode(nodesSeed1)},
|
||||
input: testENRs[0],
|
||||
e: &enrEntry{node: testNodes[0]},
|
||||
},
|
||||
{
|
||||
input: "enr:-HW4QLZHjM4vZXkbp-5xJoHsKSbE7W39FPC8283X-y8oHcHPTnDDlIlzL5ArvDUlHZVDPgmFASrh7cWgLOLxj4wprRkHgmlkgnY0iXNlY3AyNTZrMaEC3t2jLMhDpCDX5mbSEwDn4L3iUfyXzoO8G28XvjGRkrAg=",
|
||||
@ -132,7 +138,8 @@ func TestParseEntry(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestMakeTree(t *testing.T) {
|
||||
nodes := testNodes(nodesSeed2, 50)
|
||||
keys := testKeys(50)
|
||||
nodes := testNodes(keys)
|
||||
tree, err := MakeTree(2, nodes, nil)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user