forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix rebase errors

Browse source
This commit is contained in:
Guillaume Ballet 2019-11-07 18:38:20 +01:00
parent 37ff87ec29
commit e279338766
2 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
p2p/enode/urlv4.go
View file

@ -71,14 +71,12 @@ func MustParseV4(rawurl string) *Node {
// enode://<hex node id>@10.3.58.6:30303?discport=30301 // enode://<hex node id>@10.3.58.6:30303?discport=30301
func ParseV4(rawurl string) (*Node, error) { func ParseV4(rawurl string) (*Node, error) {
if m := incompleteNodeURL.FindStringSubmatch(rawurl); m != nil { if m := incompleteNodeURL.FindStringSubmatch(rawurl); m != nil {
fmt.Println("m != nil")
id, err := parsePubkey(m[1]) id, err := parsePubkey(m[1])
if err != nil { if err != nil {
return nil, fmt.Errorf("invalid public key (%v)", err) return nil, fmt.Errorf("invalid public key (%v)", err)
} }
return NewV4(id, nil, 0, 0), nil return NewV4(id, nil, 0, 0), nil
} }
fmt.Println("parse complete")
return parseComplete(rawurl) return parseComplete(rawurl)
} }

3
p2p/enode/urlv4_test.go
View file

@ -41,7 +41,6 @@ var parseNodeTests = []struct {
input string input string
wantError string wantError string
wantResult *Node wantResult *Node
retries uint
}{ }{
// Records // Records
{ {
@ -74,7 +73,6 @@ var parseNodeTests = []struct {
{ {
input: "enode://1dd9d65c4552b5eb43d5ad55a2ee3f56c6cbc1c64a5c8d659f51fcd51bace24351232b8d7821617d2b29b54b81cdefb9b3e9c37d7fd5f63270bcc9e1a6f6a439@invalid.:3", input: "enode://1dd9d65c4552b5eb43d5ad55a2ee3f56c6cbc1c64a5c8d659f51fcd51bace24351232b8d7821617d2b29b54b81cdefb9b3e9c37d7fd5f63270bcc9e1a6f6a439@invalid.:3",
wantError: `no such host`, wantError: `no such host`,
retries: 2,
}, },
{ {
input: "enode://1dd9d65c4552b5eb43d5ad55a2ee3f56c6cbc1c64a5c8d659f51fcd51bace24351232b8d7821617d2b29b54b81cdefb9b3e9c37d7fd5f63270bcc9e1a6f6a439@127.0.0.1:foo", input: "enode://1dd9d65c4552b5eb43d5ad55a2ee3f56c6cbc1c64a5c8d659f51fcd51bace24351232b8d7821617d2b29b54b81cdefb9b3e9c37d7fd5f63270bcc9e1a6f6a439@127.0.0.1:foo",
@ -185,7 +183,6 @@ func TestParseNode(t *testing.T) {
} }
if !reflect.DeepEqual(n, test.wantResult) { if !reflect.DeepEqual(n, test.wantResult) {
t.Errorf("test %q:\n result mismatch:\ngot: %#v\nwant: %#v", test.input, n, test.wantResult) t.Errorf("test %q:\n result mismatch:\ngot: %#v\nwant: %#v", test.input, n, test.wantResult)
continue
} }
} }
} }