Skip to content

Commit

Permalink
chore: reorder deps
Browse files Browse the repository at this point in the history
Signed-off-by: Simon Paitrault <[email protected]>
  • Loading branch information
Freyskeyd committed Jul 4, 2023
1 parent ef0e4a2 commit 6c9c803
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 20 deletions.
2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ ethers = {version = "2.0.4", features = ["legacy", "abigen-online"]}
# Log, Tracing & telemetry
opentelemetry = { version = "0.19", features = ["rt-tokio", "metrics"] }
opentelemetry-otlp = { version = "0.12", features = ["grpc-tonic", "metrics", "tls-roots"] }
prometheus = "0.13.3"
prometheus-client = "0.21"
tracing = { version = "0.1", default-features = false }
tracing-attributes = "0.1"
tracing-opentelemetry = "0.19"
Expand Down
2 changes: 1 addition & 1 deletion crates/topos-metrics/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ version = "0.1.0"
edition = "2021"

[dependencies]
prometheus = "0.13.3"
lazy_static.workspace = true
prometheus.workspace = true
3 changes: 1 addition & 2 deletions crates/topos-p2p/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ async-trait.workspace = true
bincode.workspace = true
futures.workspace = true
lazy_static.workspace = true
prometheus-client.workspace = true
serde = { workspace = true, features = ["derive"] }
thiserror.workspace = true
tokio = { workspace = true, features = ["full"] }
Expand All @@ -19,8 +20,6 @@ void = "1"

topos-metrics = { path = "../topos-metrics/" }

prometheus-client = "0.21.1"

[dev-dependencies]
test-log.workspace = true
env_logger.workspace = true
Expand Down
7 changes: 6 additions & 1 deletion crates/topos-p2p/src/behaviour/gossip.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ use std::{
use libp2p::{
gossipsub::{self, IdentTopic, Message, MessageAuthenticity, MessageId, Topic},
identity::Keypair,
multihash::IdentityHasher,
swarm::{NetworkBehaviour, THandlerInEvent, ToSwarm},
};
use serde::{Deserialize, Serialize};
Expand Down Expand Up @@ -190,6 +189,12 @@ impl NetworkBehaviour for Behaviour {
let event = match self.gossipsub.poll(cx, params) {
Poll::Pending => return Poll::Pending,
Poll::Ready(ToSwarm::GenerateEvent(event)) => event,
Poll::Ready(ToSwarm::ListenOn { opts }) => {
return Poll::Ready(ToSwarm::ListenOn { opts })
}
Poll::Ready(ToSwarm::RemoveListener { id }) => {
return Poll::Ready(ToSwarm::RemoveListener { id })
}
Poll::Ready(ToSwarm::Dial { opts }) => return Poll::Ready(ToSwarm::Dial { opts }),
Poll::Ready(ToSwarm::NotifyHandler {
peer_id,
Expand Down
22 changes: 11 additions & 11 deletions crates/topos-tce-api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,33 +11,33 @@ topos-metrics = { path = "../topos-metrics" }
topos-tce-storage = { path = "../topos-tce-storage" }
topos-telemetry = { path = "../topos-telemetry" }

async-trait.workspace = true
async-graphql-axum.workspace = true
async-graphql.workspace = true
async-stream.workspace = true
async-trait.workspace = true
axum.workspace = true
base64.workspace = true
futures.workspace = true
hex.workspace = true
http.workspace = true
hyper.workspace = true
opentelemetry.workspace = true
prometheus-client.workspace = true
serde.workspace = true
thiserror.workspace = true
tokio-stream.workspace = true
tokio.workspace = true
tonic.workspace = true
tower-http.workspace = true
tower.workspace = true
tracing-opentelemetry.workspace = true
tracing.workspace = true
uuid.workspace = true
base64.workspace = true
opentelemetry.workspace = true
tracing-opentelemetry.workspace = true
axum.workspace = true
async-graphql.workspace = true
async-graphql-axum.workspace = true
hyper.workspace = true
http.workspace = true
tower-http.workspace = true

tonic-health = "0.9.0"
tonic-reflection = "0.9.0"
pin-project = "1.0.12"
async-recursion = "1.0"
prometheus-client = "0.21.1"

[dev-dependencies]
bytes.workspace = true
Expand Down
10 changes: 5 additions & 5 deletions crates/topos-tce/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,17 @@ async-trait.workspace = true
bincode.workspace = true
clap.workspace = true
futures.workspace = true
opentelemetry.workspace = true
prometheus-client.workspace = true
prometheus.workspace = true
serde.workspace = true
thiserror.workspace = true
tokio.workspace = true
topos-core.workspace = true
tracing-subscriber = { workspace = true, default-features = false, features = ["std", "env-filter", "fmt", "ansi"] }
tracing.workspace = true
opentelemetry.workspace = true
tracing-attributes.workspace = true
tracing-opentelemetry.workspace = true
tracing-subscriber = { workspace = true, default-features = false, features = ["std", "env-filter", "fmt", "ansi"] }
tracing.workspace = true

tce_transport = { package = "topos-tce-transport", path = "../topos-tce-transport" }
topos-p2p = { path = "../topos-p2p" }
Expand All @@ -31,8 +33,6 @@ topos-tce-synchronizer = { path = "../topos-tce-synchronizer" }
topos-telemetry = { path = "../topos-telemetry" }
axum = "0.6.18"
axum-prometheus = "0.3.3"
prometheus = "0.13.3"
prometheus-client = "0.21.1"

[dev-dependencies]
async-stream.workspace = true
Expand Down

0 comments on commit 6c9c803

Please sign in to comment.