From e279338766eed343c5d6468767c23e0d216b2a59 Mon Sep 17 00:00:00 2001 From: Guillaume Ballet Date: Thu, 7 Nov 2019 18:38:20 +0100 Subject: [PATCH] Fix rebase errors --- p2p/enode/urlv4.go | 2 -- p2p/enode/urlv4_test.go | 3 --- 2 files changed, 5 deletions(-) diff --git a/p2p/enode/urlv4.go b/p2p/enode/urlv4.go index 3af2ec5e44..2e3f9ba00e 100644 --- a/p2p/enode/urlv4.go +++ b/p2p/enode/urlv4.go @@ -71,14 +71,12 @@ func MustParseV4(rawurl string) *Node { // enode://@10.3.58.6:30303?discport=30301 func ParseV4(rawurl string) (*Node, error) { if m := incompleteNodeURL.FindStringSubmatch(rawurl); m != nil { - fmt.Println("m != nil") id, err := parsePubkey(m[1]) if err != nil { return nil, fmt.Errorf("invalid public key (%v)", err) } return NewV4(id, nil, 0, 0), nil } - fmt.Println("parse complete") return parseComplete(rawurl) } diff --git a/p2p/enode/urlv4_test.go b/p2p/enode/urlv4_test.go index 4fcb38fdfd..33de96cc57 100644 --- a/p2p/enode/urlv4_test.go +++ b/p2p/enode/urlv4_test.go @@ -41,7 +41,6 @@ var parseNodeTests = []struct { input string wantError string wantResult *Node - retries uint }{ // Records { @@ -74,7 +73,6 @@ var parseNodeTests = []struct { { input: "enode://1dd9d65c4552b5eb43d5ad55a2ee3f56c6cbc1c64a5c8d659f51fcd51bace24351232b8d7821617d2b29b54b81cdefb9b3e9c37d7fd5f63270bcc9e1a6f6a439@invalid.:3", wantError: `no such host`, - retries: 2, }, { input: "enode://1dd9d65c4552b5eb43d5ad55a2ee3f56c6cbc1c64a5c8d659f51fcd51bace24351232b8d7821617d2b29b54b81cdefb9b3e9c37d7fd5f63270bcc9e1a6f6a439@127.0.0.1:foo", @@ -185,7 +183,6 @@ func TestParseNode(t *testing.T) { } if !reflect.DeepEqual(n, test.wantResult) { t.Errorf("test %q:\n result mismatch:\ngot: %#v\nwant: %#v", test.input, n, test.wantResult) - continue } } }