github/prysm
1
1
Fork 0
mirror of https://github.com/OffchainLabs/prysm.git synced 2026-01-08 23:18:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

Move iputil and httpuil pkgs into network pkg (#9621)

Browse Source 
* Add network pkg

* Go fmt

* Update discovery_test.go

Co-authored-by: Raul Jordan <raul@prysmaticlabs.com>
This commit is contained in:
terence tsao
2021-09-16 12:12:27 -07:00
committed by GitHub
parent 3daa2d8a18
commit f49637b09b
20 changed files with 114 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/bootnode/BUILD.bazel
View File

@@ -11,11 +11,11 @@ go_library(
visibility = ["//visibility:private"],
deps = [
"//beacon-chain/core/helpers:go_default_library",
"//network:go_default_library",
"//proto/prysm/v1alpha1:go_default_library",
"//runtime/maxprocs:go_default_library",
"//runtime/version:go_default_library",
"//shared/bytesutil:go_default_library",
"//shared/iputils:go_default_library",
"//shared/logutil:go_default_library",
"//shared/params:go_default_library",
"//shared/runutil:go_default_library",
@@ -68,8 +68,8 @@ go_test(
embed = [":go_default_library"],
flaky = True,
deps = [
"//network:go_default_library",
"//runtime/maxprocs:go_default_library",
"//shared/iputils:go_default_library",
"//shared/testutil/assert:go_default_library",
"//shared/testutil/require:go_default_library",
"@com_github_ethereum_go_ethereum//p2p/discover:go_default_library",

4
tools/bootnode/bootnode.go
View File

@@ -33,11 +33,11 @@ import (
"github.com/prometheus/client_golang/prometheus/promauto"
"github.com/prysmaticlabs/go-bitfield"
"github.com/prysmaticlabs/prysm/beacon-chain/core/helpers"
"github.com/prysmaticlabs/prysm/network"
pb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1"
_ "github.com/prysmaticlabs/prysm/runtime/maxprocs"
"github.com/prysmaticlabs/prysm/runtime/version"
"github.com/prysmaticlabs/prysm/shared/bytesutil"
"github.com/prysmaticlabs/prysm/shared/iputils"
"github.com/prysmaticlabs/prysm/shared/logutil"
"github.com/prysmaticlabs/prysm/shared/params"
"github.com/prysmaticlabs/prysm/shared/runutil"
@@ -98,7 +98,7 @@ func main() {
}
cfg.Bootnodes = []*enode.Node{node}
}
ipAddr, err := iputils.ExternalIP()
ipAddr, err := network.ExternalIP()
if err != nil {
log.Fatal(err)
}

4
tools/bootnode/bootnode_test.go
View File

@@ -11,8 +11,8 @@ import (
"github.com/ethereum/go-ethereum/p2p/discover"
"github.com/ethereum/go-ethereum/p2p/enode"
"github.com/libp2p/go-libp2p-core/crypto"
"github.com/prysmaticlabs/prysm/network"
_ "github.com/prysmaticlabs/prysm/runtime/maxprocs"
"github.com/prysmaticlabs/prysm/shared/iputils"
"github.com/prysmaticlabs/prysm/shared/testutil/assert"
"github.com/prysmaticlabs/prysm/shared/testutil/require"
"github.com/sirupsen/logrus"
@@ -26,7 +26,7 @@ func TestMain(m *testing.M) {
}
func TestBootnode_OK(t *testing.T) {
ipAddr, err := iputils.ExternalIPv4()
ipAddr, err := network.ExternalIPv4()
require.NoError(t, err)
privKey := extractPrivateKey()
cfg := discover.Config{