Skip to content

Refactor pre core module #3396

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
merged 4 commits into from
Sep 26, 2025
Merged

Refactor pre core module #3396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
55fe95e
refactor!: move canonicallog package outside of core
MarcoPolo Sep 3, 2025
403c42e
refactor: drop go-varint dependency
MarcoPolo Sep 4, 2025
758bbd2
refactor!: move insecure transport outside of core
MarcoPolo Sep 4, 2025
e1218c5
chore: gitignore go.work files
MarcoPolo Sep 19, 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
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@
*.sqlog
*.qlog.zst
*.sqlog.zst
go.work
go.work.sum
2 changes: 1 addition & 1 deletion config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import (
"github.com/libp2p/go-libp2p/core/protocol"
"github.com/libp2p/go-libp2p/core/routing"
"github.com/libp2p/go-libp2p/core/sec"
"github.com/libp2p/go-libp2p/core/sec/insecure"
"github.com/libp2p/go-libp2p/core/transport"
logging "github.com/libp2p/go-libp2p/gologshim"
"github.com/libp2p/go-libp2p/p2p/host/autonat"
Expand All @@ -40,6 +39,7 @@ import (
relayv2 "github.com/libp2p/go-libp2p/p2p/protocol/circuitv2/relay"
"github.com/libp2p/go-libp2p/p2p/protocol/holepunch"
"github.com/libp2p/go-libp2p/p2p/protocol/identify"
"github.com/libp2p/go-libp2p/p2p/security/insecure"
"github.com/libp2p/go-libp2p/p2p/transport/quicreuse"
"github.com/libp2p/go-libp2p/p2p/transport/tcpreuse"
libp2pwebrtc "github.com/libp2p/go-libp2p/p2p/transport/webrtc"
Expand Down
4 changes: 2 additions & 2 deletions core/record/envelope.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package record

import (
"bytes"
"encoding/binary"
"errors"
"fmt"
"sync"
Expand All @@ -12,7 +13,6 @@ import (

pool "github.com/libp2p/go-buffer-pool"

"github.com/multiformats/go-varint"
"google.golang.org/protobuf/proto"
)

Expand Down Expand Up @@ -278,7 +278,7 @@ func makeUnsigned(domain string, payloadType []byte, payload []byte) ([]byte, er

for i, f := range fields {
l := len(f)
flen[i] = varint.ToUvarint(uint64(l))
flen[i] = binary.AppendUvarint(nil, uint64(l))
size += l + len(flen[i])
}

Expand Down
12 changes: 0 additions & 12 deletions core/sec/insecure/pb/plaintext.proto
View file
Open in desktop

This file was deleted.

0 core/canonicallog/canonicallog.go → p2p/canonicallog/canonicallog.go
View file
Open in desktop
File renamed without changes.
0 core/canonicallog/canonicallog_test.go → p2p/canonicallog/canonicallog_test.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion p2p/net/swarm/dial_worker_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ import (
"github.com/libp2p/go-libp2p/core/peer"
"github.com/libp2p/go-libp2p/core/peerstore"
"github.com/libp2p/go-libp2p/core/sec"
"github.com/libp2p/go-libp2p/core/sec/insecure"
"github.com/libp2p/go-libp2p/core/test"
"github.com/libp2p/go-libp2p/core/transport"
"github.com/libp2p/go-libp2p/p2p/host/eventbus"
"github.com/libp2p/go-libp2p/p2p/host/peerstore/pstoremem"
"github.com/libp2p/go-libp2p/p2p/muxer/yamux"
tptu "github.com/libp2p/go-libp2p/p2p/net/upgrader"
"github.com/libp2p/go-libp2p/p2p/security/insecure"
libp2pquic "github.com/libp2p/go-libp2p/p2p/transport/quic"
"github.com/libp2p/go-libp2p/p2p/transport/quicreuse"
"github.com/libp2p/go-libp2p/p2p/transport/tcp"
Expand Down
2 changes: 1 addition & 1 deletion p2p/net/swarm/swarm_dial.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import (
"sync"
"time"

"github.com/libp2p/go-libp2p/core/canonicallog"
"github.com/libp2p/go-libp2p/core/network"
"github.com/libp2p/go-libp2p/core/peer"
"github.com/libp2p/go-libp2p/core/peerstore"
"github.com/libp2p/go-libp2p/core/transport"
"github.com/libp2p/go-libp2p/p2p/canonicallog"

ma "github.com/multiformats/go-multiaddr"
mafmt "github.com/multiformats/go-multiaddr-fmt"
Expand Down
2 changes: 1 addition & 1 deletion p2p/net/swarm/swarm_listen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"slices"
"time"

"github.com/libp2p/go-libp2p/core/canonicallog"
"github.com/libp2p/go-libp2p/core/network"
"github.com/libp2p/go-libp2p/core/transport"
"github.com/libp2p/go-libp2p/p2p/canonicallog"

ma "github.com/multiformats/go-multiaddr"
)
Expand Down
2 changes: 1 addition & 1 deletion p2p/net/swarm/testing/testing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ import (
"github.com/libp2p/go-libp2p/core/peer"
"github.com/libp2p/go-libp2p/core/peerstore"
"github.com/libp2p/go-libp2p/core/sec"
"github.com/libp2p/go-libp2p/core/sec/insecure"
"github.com/libp2p/go-libp2p/core/transport"
"github.com/libp2p/go-libp2p/p2p/host/eventbus"
"github.com/libp2p/go-libp2p/p2p/host/peerstore/pstoremem"
"github.com/libp2p/go-libp2p/p2p/muxer/yamux"
"github.com/libp2p/go-libp2p/p2p/net/swarm"
tptu "github.com/libp2p/go-libp2p/p2p/net/upgrader"
"github.com/libp2p/go-libp2p/p2p/security/insecure"
libp2pquic "github.com/libp2p/go-libp2p/p2p/transport/quic"
"github.com/libp2p/go-libp2p/p2p/transport/quicreuse"
"github.com/libp2p/go-libp2p/p2p/transport/tcp"
Expand Down
2 changes: 1 addition & 1 deletion p2p/net/upgrader/listener_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import (
mocknetwork "github.com/libp2p/go-libp2p/core/network/mocks"
"github.com/libp2p/go-libp2p/core/peer"
"github.com/libp2p/go-libp2p/core/sec"
"github.com/libp2p/go-libp2p/core/sec/insecure"
"github.com/libp2p/go-libp2p/core/transport"
"github.com/libp2p/go-libp2p/p2p/net/upgrader"
"github.com/libp2p/go-libp2p/p2p/security/insecure"

ma "github.com/multiformats/go-multiaddr"
manet "github.com/multiformats/go-multiaddr/net"
Expand Down
2 changes: 1 addition & 1 deletion p2p/net/upgrader/upgrader_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ import (
mocknetwork "github.com/libp2p/go-libp2p/core/network/mocks"
"github.com/libp2p/go-libp2p/core/peer"
"github.com/libp2p/go-libp2p/core/sec"
"github.com/libp2p/go-libp2p/core/sec/insecure"
"github.com/libp2p/go-libp2p/core/transport"
"github.com/libp2p/go-libp2p/p2p/muxer/yamux"
"github.com/libp2p/go-libp2p/p2p/net/upgrader"
"github.com/libp2p/go-libp2p/p2p/security/insecure"

ma "github.com/multiformats/go-multiaddr"
manet "github.com/multiformats/go-multiaddr/net"
Expand Down
4 changes: 2 additions & 2 deletions core/sec/insecure/insecure.go → p2p/security/insecure/insecure.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Package insecure provides an insecure, unencrypted implementation of the SecureConn and SecureTransport interfaces.
//
// Recommended only for testing and other non-production usage.
// Not Recommended
package insecure

import (
Expand All @@ -14,7 +14,7 @@ import (
"github.com/libp2p/go-libp2p/core/peer"
"github.com/libp2p/go-libp2p/core/protocol"
"github.com/libp2p/go-libp2p/core/sec"
"github.com/libp2p/go-libp2p/core/sec/insecure/pb"
"github.com/libp2p/go-libp2p/p2p/security/insecure/pb"

"github.com/libp2p/go-msgio"

Expand Down
0 core/sec/insecure/insecure_test.go → p2p/security/insecure/insecure_test.go
View file
Open in desktop
File renamed without changes.
54 changes: 27 additions & 27 deletions core/sec/insecure/pb/plaintext.pb.go → p2p/security/insecure/pb/plaintext.pb.go
View file
Open in desktop

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

12 changes: 12 additions & 0 deletions p2p/security/insecure/pb/plaintext.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
syntax = "proto2";

package plaintext.pb;

import "core/crypto/pb/crypto.proto";

option go_package = "github.com/libp2p/go-libp2p/p2p/security/insecure/pb";

message Exchange {
optional bytes id = 1;
optional crypto.pb.PublicKey pubkey = 2;
}
2 changes: 1 addition & 1 deletion p2p/security/noise/session_transport.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"context"
"net"

"github.com/libp2p/go-libp2p/core/canonicallog"
"github.com/libp2p/go-libp2p/core/peer"
"github.com/libp2p/go-libp2p/core/protocol"
"github.com/libp2p/go-libp2p/core/sec"
"github.com/libp2p/go-libp2p/p2p/canonicallog"
"github.com/libp2p/go-libp2p/p2p/security/noise/pb"

manet "github.com/multiformats/go-multiaddr/net"
Expand Down
2 changes: 1 addition & 1 deletion p2p/security/noise/transport.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import (
"context"
"net"

"github.com/libp2p/go-libp2p/core/canonicallog"
"github.com/libp2p/go-libp2p/core/crypto"
"github.com/libp2p/go-libp2p/core/peer"
"github.com/libp2p/go-libp2p/core/protocol"
"github.com/libp2p/go-libp2p/core/sec"
"github.com/libp2p/go-libp2p/p2p/canonicallog"
tptu "github.com/libp2p/go-libp2p/p2p/net/upgrader"
"github.com/libp2p/go-libp2p/p2p/security/noise/pb"

Expand Down
2 changes: 1 addition & 1 deletion p2p/security/tls/transport.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ import (
"os"
"runtime/debug"

"github.com/libp2p/go-libp2p/core/canonicallog"
ci "github.com/libp2p/go-libp2p/core/crypto"
"github.com/libp2p/go-libp2p/core/network"
"github.com/libp2p/go-libp2p/core/peer"
"github.com/libp2p/go-libp2p/core/protocol"
"github.com/libp2p/go-libp2p/core/sec"
"github.com/libp2p/go-libp2p/p2p/canonicallog"
tptu "github.com/libp2p/go-libp2p/p2p/net/upgrader"

manet "github.com/multiformats/go-multiaddr/net"
Expand Down
2 changes: 1 addition & 1 deletion p2p/test/negotiation/muxer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"github.com/libp2p/go-libp2p/core/crypto"
"github.com/libp2p/go-libp2p/core/peer"
"github.com/libp2p/go-libp2p/core/protocol"
"github.com/libp2p/go-libp2p/core/sec/insecure"
"github.com/libp2p/go-libp2p/p2p/muxer/yamux"
"github.com/libp2p/go-libp2p/p2p/security/insecure"
"github.com/libp2p/go-libp2p/p2p/security/noise"
tls "github.com/libp2p/go-libp2p/p2p/security/tls"
"github.com/libp2p/go-libp2p/p2p/transport/tcp"
Expand Down
2 changes: 1 addition & 1 deletion p2p/transport/tcp/tcp_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import (
mocknetwork "github.com/libp2p/go-libp2p/core/network/mocks"
"github.com/libp2p/go-libp2p/core/peer"
"github.com/libp2p/go-libp2p/core/sec"
"github.com/libp2p/go-libp2p/core/sec/insecure"
"github.com/libp2p/go-libp2p/core/transport"
"github.com/libp2p/go-libp2p/p2p/muxer/yamux"
tptu "github.com/libp2p/go-libp2p/p2p/net/upgrader"
"github.com/libp2p/go-libp2p/p2p/security/insecure"
"github.com/libp2p/go-libp2p/p2p/transport/tcpreuse"
ttransport "github.com/libp2p/go-libp2p/p2p/transport/testsuite"

Expand Down
2 changes: 1 addition & 1 deletion p2p/transport/websocket/websocket_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ import (
"github.com/libp2p/go-libp2p/core/network"
"github.com/libp2p/go-libp2p/core/peer"
"github.com/libp2p/go-libp2p/core/sec"
"github.com/libp2p/go-libp2p/core/sec/insecure"
"github.com/libp2p/go-libp2p/core/test"
"github.com/libp2p/go-libp2p/core/transport"
"github.com/libp2p/go-libp2p/p2p/muxer/yamux"
tptu "github.com/libp2p/go-libp2p/p2p/net/upgrader"
"github.com/libp2p/go-libp2p/p2p/security/insecure"
"github.com/libp2p/go-libp2p/p2p/security/noise"
ttransport "github.com/libp2p/go-libp2p/p2p/transport/testsuite"

Expand Down
2 changes: 1 addition & 1 deletion proto_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ import (
_ "github.com/libp2p/go-libp2p/core/crypto/pb"
_ "github.com/libp2p/go-libp2p/core/peer/pb"
_ "github.com/libp2p/go-libp2p/core/record/pb"
_ "github.com/libp2p/go-libp2p/core/sec/insecure/pb"
_ "github.com/libp2p/go-libp2p/p2p/host/autonat/pb"
_ "github.com/libp2p/go-libp2p/p2p/host/peerstore/pstoreds/pb"
_ "github.com/libp2p/go-libp2p/p2p/protocol/autonatv2/pb"
_ "github.com/libp2p/go-libp2p/p2p/protocol/circuitv2/pb"
_ "github.com/libp2p/go-libp2p/p2p/protocol/holepunch/pb"
_ "github.com/libp2p/go-libp2p/p2p/protocol/identify/pb"
_ "github.com/libp2p/go-libp2p/p2p/security/insecure/pb"
_ "github.com/libp2p/go-libp2p/p2p/security/noise/pb"
_ "github.com/libp2p/go-libp2p/p2p/transport/webrtc/pb"
"google.golang.org/protobuf/reflect/protoreflect"
Expand Down
2 changes: 1 addition & 1 deletion scripts/gen-proto.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ proto_array=(
core/crypto/pb/crypto.proto
core/record/pb/envelope.proto
core/peer/pb/peer_record.proto
core/sec/insecure/pb/plaintext.proto
p2p/security/insecure/pb/plaintext.proto
p2p/host/autonat/pb/autonat.proto
p2p/security/noise/pb/payload.proto
p2p/transport/webrtc/pb/message.proto
Expand Down
Loading