Skip to content

dir improvements: revert turning p2p into a module #15675

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AskAlexSharov merged 8 commits into from
Jun 21, 2025
Merged

dir improvements: revert turning p2p into a module #15675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
98cba0f
revert turning p2p into a module
yperbasis Jun 20, 2025
29037e4
go mod tidy
yperbasis Jun 20, 2025
6df0c86
mv write_genesis back to core
yperbasis Jun 20, 2025
cdbd6bc
mv interfaces back to turbo/services
yperbasis Jun 20, 2025
b9b2696
go.mod: merge indirect deps
yperbasis Jun 20, 2025
d7ae0a3
mv sentry_multi_client back to p2p
yperbasis Jun 20, 2025
89cd2da
mv TestCreation back to p2p
yperbasis Jun 20, 2025
c302920
rm PoWMainnetChainConfig
yperbasis Jun 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,3 @@ jobs:

- name: Test erigon-db
run: cd erigon-db && make test-short

- name: Test p2p
run: cd p2p && make test-short
2 changes: 0 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ ADD erigon-lib/go.mod erigon-lib/go.mod
ADD erigon-lib/go.sum erigon-lib/go.sum
ADD erigon-db/go.mod erigon-db/go.mod
ADD erigon-db/go.sum erigon-db/go.sum
ADD p2p/go.mod p2p/go.mod
ADD p2p/go.sum p2p/go.sum

RUN go mod download
ADD . .
Expand Down
4 changes: 0 additions & 4 deletions Dockerfile.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ ADD erigon-lib/go.mod erigon-lib/go.mod
ADD erigon-lib/go.sum erigon-lib/go.sum
ADD erigon-db/go.mod erigon-db/go.mod
ADD erigon-db/go.sum erigon-db/go.sum
ADD p2p/go.mod p2p/go.mod
ADD p2p/go.sum p2p/go.sum

RUN go mod download
ADD . .
Expand All @@ -34,8 +32,6 @@ ADD erigon-lib/go.mod erigon-lib/go.mod
ADD erigon-lib/go.sum erigon-lib/go.sum
ADD erigon-db/go.mod erigon-db/go.mod
ADD erigon-db/go.sum erigon-db/go.sum
ADD p2p/go.mod p2p/go.mod
ADD p2p/go.sum p2p/go.sum

RUN mkdir -p /app/build/bin

Expand Down
17 changes: 3 additions & 14 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,20 +193,11 @@ test-erigon-db-all:
test-erigon-db-all-race:
@cd erigon-db && $(MAKE) test-all-race

test-p2-short:
@cd p2p && $(MAKE) test-short

test-p2p-all:
@cd p2p && $(MAKE) test-all

test-p2p-all-race:
@cd p2p && $(MAKE) test-all-race

test-erigon-ext:
@cd tests/erigon-ext-test && ./test.sh $(GIT_COMMIT)

## test-short: run short tests with a 10m timeout
test-short: test-erigon-lib-short test-erigon-db-short test-p2-short
test-short: test-erigon-lib-short test-erigon-db-short
@{ \
$(GOTEST) -short --timeout 10m -coverprofile=coverage-test.out > run.log 2>&1; \
STATUS=$$?; \
Expand All @@ -215,7 +206,7 @@ test-short: test-erigon-lib-short test-erigon-db-short test-p2-short
}

## test-all: run all tests with a 1h timeout
test-all: test-erigon-lib-all test-erigon-db-all test-p2p-all
test-all: test-erigon-lib-all test-erigon-db-all
@{ \
$(GOTEST) --timeout 60m -coverprofile=coverage-test-all.out > run.log 2>&1; \
STATUS=$$?; \
Expand All @@ -224,7 +215,7 @@ test-all: test-erigon-lib-all test-erigon-db-all test-p2p-all
}

## test-all-race: run all tests with the race flag
test-all-race: test-erigon-lib-all-race test-erigon-db-all-race test-p2p-all-race
test-all-race: test-erigon-lib-all-race test-erigon-db-all-race
@{ \
$(GOTEST) --timeout 60m -coverprofile=coverage-test-all.out -race > run.log 2>&1; \
STATUS=$$?; \
Expand Down Expand Up @@ -350,13 +341,11 @@ lint:
@./erigon-lib/tools/golangci_lint.sh
@./erigon-lib/tools/mod_tidy_check.sh
@cd erigon-db && ./../erigon-lib/tools/mod_tidy_check.sh
@cd p2p && ./../erigon-lib/tools/mod_tidy_check.sh

## tidy: `go mod tidy`
tidy:
cd erigon-lib && go mod tidy
cd erigon-db && go mod tidy
cd p2p && go mod tidy
go mod tidy

## clean: cleans the go cache, build dir, libmdbx db dir
Expand Down
2 changes: 1 addition & 1 deletion cl/beacon/beaconevents/operation_feed.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package beaconevents

import ethevent "github.com/erigontech/erigon-p2p/event"
import ethevent "github.com/erigontech/erigon/p2p/event"

type operationFeed struct {
feed *ethevent.Feed
Expand Down
2 changes: 1 addition & 1 deletion cl/beacon/beaconevents/state_feed.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package beaconevents

import (
ethevent "github.com/erigontech/erigon-p2p/event"
ethevent "github.com/erigontech/erigon/p2p/event"
)

type stateFeed struct {
Expand Down
6 changes: 3 additions & 3 deletions cl/sentinel/discovery.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ import (
"github.com/libp2p/go-libp2p/core/peer"
"github.com/multiformats/go-multiaddr"
"github.com/prysmaticlabs/go-bitfield"
"golang.org/x/sync/semaphore"

"github.com/erigontech/erigon-lib/log/v3"
"github.com/erigontech/erigon-p2p/enode"
"github.com/erigontech/erigon-p2p/enr"
"github.com/erigontech/erigon/cl/clparams"
"golang.org/x/sync/semaphore"
"github.com/erigontech/erigon/p2p/enode"
"github.com/erigontech/erigon/p2p/enr"
)

const (
Expand Down
15 changes: 7 additions & 8 deletions cl/sentinel/handlers/handlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,22 @@ import (
"sync"
"time"

"github.com/libp2p/go-libp2p/core/host"
"github.com/libp2p/go-libp2p/core/network"
"github.com/libp2p/go-libp2p/core/protocol"

"github.com/erigontech/erigon-lib/kv"
"github.com/erigontech/erigon-p2p/enode"
"github.com/erigontech/erigon-lib/log/v3"
"github.com/erigontech/erigon/cl/clparams"
"github.com/erigontech/erigon/cl/persistence/blob_storage"
"github.com/erigontech/erigon/cl/phase1/forkchoice"
"github.com/erigontech/erigon/cl/sentinel/communication"
"github.com/erigontech/erigon/cl/sentinel/handshake"
"github.com/erigontech/erigon/cl/sentinel/peers"
"github.com/erigontech/erigon/cl/utils"
"github.com/erigontech/erigon/cl/utils/eth_clock"
"github.com/erigontech/erigon/p2p/enode"
"github.com/erigontech/erigon/turbo/snapshotsync/freezeblocks"

"github.com/libp2p/go-libp2p/core/host"
"github.com/libp2p/go-libp2p/core/network"
"github.com/libp2p/go-libp2p/core/protocol"

"github.com/erigontech/erigon-lib/log/v3"
"github.com/erigontech/erigon/cl/clparams"
)

type RateLimits struct {
Expand Down
2 changes: 1 addition & 1 deletion cl/sentinel/handlers/heartbeats.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ import (
"github.com/libp2p/go-libp2p/core/network"

"github.com/erigontech/erigon-lib/log/v3"
"github.com/erigontech/erigon-p2p/enr"
"github.com/erigontech/erigon/cl/clparams"
"github.com/erigontech/erigon/cl/cltypes"
"github.com/erigontech/erigon/cl/sentinel/communication/ssz_snappy"
"github.com/erigontech/erigon/p2p/enr"
)

// Type safe handlers which all have access to the original stream & decompressed data.
Expand Down
4 changes: 2 additions & 2 deletions cl/sentinel/handlers/heartbeats_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@ import (
"github.com/erigontech/erigon-lib/common"
"github.com/erigontech/erigon-lib/crypto"
"github.com/erigontech/erigon-lib/log/v3"
"github.com/erigontech/erigon-p2p/enode"
"github.com/erigontech/erigon-p2p/enr"
"github.com/erigontech/erigon/cl/clparams"
"github.com/erigontech/erigon/cl/cltypes"
"github.com/erigontech/erigon/cl/phase1/forkchoice/mock_services"
"github.com/erigontech/erigon/cl/sentinel/communication"
"github.com/erigontech/erigon/cl/sentinel/communication/ssz_snappy"
"github.com/erigontech/erigon/cl/sentinel/handshake"
"github.com/erigontech/erigon/cl/sentinel/peers"
"github.com/erigontech/erigon/p2p/enode"
"github.com/erigontech/erigon/p2p/enr"
)

var (
Expand Down
6 changes: 3 additions & 3 deletions cl/sentinel/sentinel.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,6 @@ import (
sentinelrpc "github.com/erigontech/erigon-lib/gointerfaces/sentinelproto"
"github.com/erigontech/erigon-lib/kv"
"github.com/erigontech/erigon-lib/log/v3"
"github.com/erigontech/erigon-p2p/discover"
"github.com/erigontech/erigon-p2p/enode"
"github.com/erigontech/erigon-p2p/enr"
"github.com/erigontech/erigon/cl/cltypes"
"github.com/erigontech/erigon/cl/monitor"
"github.com/erigontech/erigon/cl/persistence/blob_storage"
Expand All @@ -55,6 +52,9 @@ import (
"github.com/erigontech/erigon/cl/sentinel/httpreqresp"
"github.com/erigontech/erigon/cl/sentinel/peers"
"github.com/erigontech/erigon/cl/utils/eth_clock"
"github.com/erigontech/erigon/p2p/discover"
"github.com/erigontech/erigon/p2p/enode"
"github.com/erigontech/erigon/p2p/enr"
"github.com/erigontech/erigon/turbo/snapshotsync/freezeblocks"
)

Expand Down
4 changes: 2 additions & 2 deletions cl/sentinel/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ import (

"github.com/erigontech/erigon-lib/common"
"github.com/erigontech/erigon-lib/log/v3"
"github.com/erigontech/erigon-p2p/enode"
"github.com/erigontech/erigon-p2p/enr"
"github.com/erigontech/erigon/cl/gossip"
"github.com/erigontech/erigon/p2p/enode"
"github.com/erigontech/erigon/p2p/enr"
)

func convertToInterfacePubkey(pubkey *ecdsa.PublicKey) (crypto.PubKey, error) {
Expand Down
8 changes: 4 additions & 4 deletions cmd/bootnode/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ import (

"github.com/erigontech/erigon-lib/common"
"github.com/erigontech/erigon-lib/crypto"
"github.com/erigontech/erigon-p2p/discover"
"github.com/erigontech/erigon-p2p/enode"
"github.com/erigontech/erigon-p2p/nat"
"github.com/erigontech/erigon-p2p/netutil"
"github.com/erigontech/erigon/cmd/utils"
"github.com/erigontech/erigon/p2p/discover"
"github.com/erigontech/erigon/p2p/enode"
"github.com/erigontech/erigon/p2p/nat"
"github.com/erigontech/erigon/p2p/netutil"
"github.com/erigontech/erigon/turbo/logging"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/devnet/args/node_args.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ import (

"github.com/erigontech/erigon-lib/chain/networkname"
"github.com/erigontech/erigon-lib/crypto"
"github.com/erigontech/erigon-p2p/enode"
"github.com/erigontech/erigon/cmd/devnet/accounts"
"github.com/erigontech/erigon/core"
"github.com/erigontech/erigon/p2p/enode"
"github.com/erigontech/erigon/params"
"github.com/erigontech/erigon/rpc/requests"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/devnet/contracts/gen_childreceiver.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cmd/devnet/contracts/gen_childsender.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cmd/devnet/contracts/gen_faucet.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cmd/devnet/contracts/gen_rootreceiver.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cmd/devnet/contracts/gen_rootsender.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cmd/devnet/contracts/gen_subscription.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cmd/devnet/contracts/gen_testrootchain.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cmd/devnet/contracts/gen_teststatesender.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cmd/downloader/downloadernat/nat.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"github.com/anacrolix/torrent"

"github.com/erigontech/erigon-lib/log/v3"
"github.com/erigontech/erigon-p2p/nat"
"github.com/erigontech/erigon/p2p/nat"
)

// DoNat can mutate `cfg` parameter
Expand Down
6 changes: 3 additions & 3 deletions cmd/downloader/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,16 +57,16 @@ import (
"github.com/erigontech/erigon-lib/kv"
"github.com/erigontech/erigon-lib/kv/mdbx"
"github.com/erigontech/erigon-lib/log/v3"
"github.com/erigontech/erigon-p2p/nat"
"github.com/erigontech/erigon/cmd/downloader/downloadernat"
"github.com/erigontech/erigon/cmd/hack/tool"
"github.com/erigontech/erigon/cmd/utils"
"github.com/erigontech/erigon/p2p/nat"
"github.com/erigontech/erigon/params"
_ "github.com/erigontech/erigon/polygon/heimdall" //hack
"github.com/erigontech/erigon/turbo/debug"
"github.com/erigontech/erigon/turbo/logging"

_ "github.com/erigontech/erigon-db/snaptype" //hack
_ "github.com/erigontech/erigon-db/snaptype" //hack
_ "github.com/erigontech/erigon/polygon/heimdall" //hack
)

func main() {
Expand Down
6 changes: 3 additions & 3 deletions cmd/integration/commands/stages.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,6 @@ import (
"github.com/erigontech/erigon-lib/state/stats"
"github.com/erigontech/erigon-lib/types"
"github.com/erigontech/erigon-lib/wrap"
p2p "github.com/erigontech/erigon-p2p"
"github.com/erigontech/erigon-p2p/sentry"
"github.com/erigontech/erigon/cl/clparams"
"github.com/erigontech/erigon/cmd/hack/tool/fromdb"
"github.com/erigontech/erigon/core"
Expand All @@ -70,9 +68,11 @@ import (
"github.com/erigontech/erigon/eth/stagedsync/stages"
"github.com/erigontech/erigon/execution/builder"
"github.com/erigontech/erigon/execution/consensus"
"github.com/erigontech/erigon/execution/sentry_multi_client"
"github.com/erigontech/erigon/node/migrations"
"github.com/erigontech/erigon/node/nodecfg"
"github.com/erigontech/erigon/p2p"
"github.com/erigontech/erigon/p2p/sentry"
"github.com/erigontech/erigon/p2p/sentry/sentry_multi_client"
"github.com/erigontech/erigon/params"
"github.com/erigontech/erigon/polygon/bor"
"github.com/erigontech/erigon/polygon/bridge"
Expand Down
4 changes: 2 additions & 2 deletions cmd/observer/observer/crawler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ import (

"github.com/erigontech/erigon-lib/common"
"github.com/erigontech/erigon-lib/log/v3"
"github.com/erigontech/erigon-p2p/enode"
"github.com/erigontech/erigon-p2p/forkid"
"github.com/erigontech/erigon/cmd/observer/database"
"github.com/erigontech/erigon/cmd/observer/observer/node_utils"
"github.com/erigontech/erigon/cmd/observer/observer/sentry_candidates"
"github.com/erigontech/erigon/cmd/observer/utils"
"github.com/erigontech/erigon/p2p/enode"
"github.com/erigontech/erigon/p2p/forkid"
"github.com/erigontech/erigon/params"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/observer/observer/diplomat.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ import (
"time"

"github.com/erigontech/erigon-lib/log/v3"
p2p "github.com/erigontech/erigon-p2p"
"github.com/erigontech/erigon-p2p/enode"
"github.com/erigontech/erigon/cmd/observer/database"
"github.com/erigontech/erigon/p2p"
"github.com/erigontech/erigon/p2p/enode"
)

type Diplomat struct {
Expand Down
Loading
Loading