From 94601824b8238c9c1b465104c21508855fed1a37 Mon Sep 17 00:00:00 2001 From: AurelienFT Date: Wed, 22 Jan 2025 23:23:48 +0100 Subject: [PATCH 1/4] Fix netlink-proto --- Cargo.lock | 1 + crates/services/p2p/Cargo.toml | 2 ++ crates/services/p2p/src/lib.rs | 2 ++ 3 files changed, 5 insertions(+) diff --git a/Cargo.lock b/Cargo.lock index a51001b7391..a5bc66c47fe 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3759,6 +3759,7 @@ dependencies = [ "libp2p", "libp2p-mplex", "libp2p-swarm-test", + "netlink-proto", "postcard", "prometheus-client", "quick-protobuf", diff --git a/crates/services/p2p/Cargo.toml b/crates/services/p2p/Cargo.toml index 158f16f836f..b93dab1f0cd 100644 --- a/crates/services/p2p/Cargo.toml +++ b/crates/services/p2p/Cargo.toml @@ -55,6 +55,8 @@ thiserror = "1.0.47" tokio = { workspace = true, features = ["sync"] } tracing = { workspace = true } void = "1" +# Remove when we upgrade rust version +netlink-proto = "=0.11.3" [dev-dependencies] ctor = "0.1" diff --git a/crates/services/p2p/src/lib.rs b/crates/services/p2p/src/lib.rs index 375eeb7351c..f59a581317a 100644 --- a/crates/services/p2p/src/lib.rs +++ b/crates/services/p2p/src/lib.rs @@ -18,6 +18,8 @@ mod utils; mod cached_view; +use netlink_proto as _; + pub use gossipsub::config as gossipsub_config; pub use heartbeat::Config; From 47178639c1be833cb73b823193bc8a5919cb3e8d Mon Sep 17 00:00:00 2001 From: AurelienFT Date: Wed, 22 Jan 2025 23:30:56 +0100 Subject: [PATCH 2/4] sort --- crates/services/p2p/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/services/p2p/Cargo.toml b/crates/services/p2p/Cargo.toml index b93dab1f0cd..a2b9f5de973 100644 --- a/crates/services/p2p/Cargo.toml +++ b/crates/services/p2p/Cargo.toml @@ -39,6 +39,8 @@ libp2p = { version = "0.53.2", default-features = false, features = [ "metrics", ] } libp2p-mplex = "0.41.0" +# Remove when we upgrade rust version +netlink-proto = "=0.11.3" postcard = { workspace = true, features = ["use-std"] } prometheus-client = { workspace = true } quick-protobuf = "0.8.1" @@ -55,8 +57,6 @@ thiserror = "1.0.47" tokio = { workspace = true, features = ["sync"] } tracing = { workspace = true } void = "1" -# Remove when we upgrade rust version -netlink-proto = "=0.11.3" [dev-dependencies] ctor = "0.1" From 4d796771806a51a2f50af14167923c3ee3478da8 Mon Sep 17 00:00:00 2001 From: AurelienFT Date: Thu, 23 Jan 2025 00:34:01 +0100 Subject: [PATCH 3/4] fix compil error mac --- crates/services/p2p/Cargo.toml | 4 +++- crates/services/p2p/src/lib.rs | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/crates/services/p2p/Cargo.toml b/crates/services/p2p/Cargo.toml index a2b9f5de973..2101afb28fa 100644 --- a/crates/services/p2p/Cargo.toml +++ b/crates/services/p2p/Cargo.toml @@ -39,8 +39,10 @@ libp2p = { version = "0.53.2", default-features = false, features = [ "metrics", ] } libp2p-mplex = "0.41.0" + # Remove when we upgrade rust version -netlink-proto = "=0.11.3" +netlink-proto = { version = "=0.11.3", optional = true } + postcard = { workspace = true, features = ["use-std"] } prometheus-client = { workspace = true } quick-protobuf = "0.8.1" diff --git a/crates/services/p2p/src/lib.rs b/crates/services/p2p/src/lib.rs index f59a581317a..375eeb7351c 100644 --- a/crates/services/p2p/src/lib.rs +++ b/crates/services/p2p/src/lib.rs @@ -18,8 +18,6 @@ mod utils; mod cached_view; -use netlink_proto as _; - pub use gossipsub::config as gossipsub_config; pub use heartbeat::Config; From 0171e349feacf648c4f4cc2377e1782a665b66ed Mon Sep 17 00:00:00 2001 From: AurelienFT Date: Thu, 23 Jan 2025 01:54:40 +0100 Subject: [PATCH 4/4] change fix to be os-specific --- crates/services/p2p/Cargo.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/crates/services/p2p/Cargo.toml b/crates/services/p2p/Cargo.toml index 2101afb28fa..d7963efbf99 100644 --- a/crates/services/p2p/Cargo.toml +++ b/crates/services/p2p/Cargo.toml @@ -39,10 +39,6 @@ libp2p = { version = "0.53.2", default-features = false, features = [ "metrics", ] } libp2p-mplex = "0.41.0" - -# Remove when we upgrade rust version -netlink-proto = { version = "=0.11.3", optional = true } - postcard = { workspace = true, features = ["use-std"] } prometheus-client = { workspace = true } quick-protobuf = "0.8.1" @@ -76,3 +72,7 @@ version = "0.3.0" [features] test-helpers = ["fuel-core-types/test-helpers"] + +# Remove when we upgrade rust version +[target.'cfg(target_os = "linux")'.dependencies] +netlink-proto = { version = "=0.11.3", optional = true }