Skip to content

Painless upgrade to Libp2p v0.48.0 #3553

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
AgeManning merged 1 commit into from
Sep 7, 2022
Merged

Painless upgrade to Libp2p v0.48.0 #3553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
81 changes: 40 additions & 41 deletions Cargo.lock
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 beacon_node/lighthouse_network/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ unused_port = { path = "../../common/unused_port" }
delay_map = "0.1.1"

[dependencies.libp2p]
version = "0.47.0"
version = "0.48.0"
default-features = false
features = ["websocket", "identify", "mplex", "yamux", "noise", "gossipsub", "dns-tokio", "tcp-tokio", "plaintext", "secp256k1"]

Expand Down
2 changes: 0 additions & 2 deletions beacon_node/lighthouse_network/src/discovery/enr_ext.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,6 @@ impl CombinedKeyExt for CombinedKey {
.expect("libp2p key must be valid");
Ok(CombinedKey::from(ed_keypair))
}
_ => Err("ENR: Unsupported libp2p key type"),
}
}
}
Expand Down Expand Up @@ -266,7 +265,6 @@ pub fn peer_id_to_node_id(peer_id: &PeerId) -> Result<discv5::enr::NodeId, Strin
hasher.finalize(&mut output);
Ok(discv5::enr::NodeId::parse(&output).expect("Must be correct length"))
}
_ => Err("Unsupported public key".into()),
}
}

Expand Down
4 changes: 2 additions & 2 deletions beacon_node/lighthouse_network/src/service/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -624,7 +624,7 @@ impl<AppReqId: ReqId, TSpec: EthSpec> Network<AppReqId, TSpec> {
let message_data = message.encode(GossipEncoding::default());
if let Err(e) = self
.gossipsub_mut()
.publish(topic.clone().into(), message_data.clone())
.publish(Topic::from(topic.clone()), message_data.clone())
{
slog::warn!(self.log, "Could not publish message"; "error" => ?e);

Expand Down Expand Up @@ -1070,7 +1070,7 @@ impl<AppReqId: ReqId, TSpec: EthSpec> Network<AppReqId, TSpec> {
.swarm
.behaviour_mut()
.gossipsub
.publish(topic.clone().into(), data)
.publish(Topic::from(topic.clone()), data)
{
Ok(_) => {
warn!(self.log, "Gossip message published on retry"; "topic" => topic_str);
Expand Down