Skip to content

Commit 605f238

Browse files
jpraynaudjpraynaud
committed
chore(relay): use 'DmqNetwork' model
1 parent ca1c0ae commit 605f238

File tree

5 files changed

+32
-37
lines changed

5 files changed

+32
-37
lines changed

‎mithril-relay/src/commands/aggregator.rs‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ use clap::Parser;
55
use libp2p::Multiaddr;
66
use slog::error;
77

8-
#[cfg(feature = "future_dmq")]
9-
use mithril_common::CardanoNetwork;
108
use mithril_common::StdResult;
9+
#[cfg(feature = "future_dmq")]
10+
use mithril_dmq::DmqNetwork;
1111

1212
use crate::AggregatorRelay;
1313

@@ -33,16 +33,16 @@ pub struct AggregatorCommand {
3333
)]
3434
dmq_node_socket_path: PathBuf,
3535

36-
/// Cardano network
36+
/// DMQ network
3737
#[cfg(feature = "future_dmq")]
3838
#[clap(long, env = "NETWORK")]
3939
pub network: String,
4040

41-
/// Cardano Network Magic number
41+
/// DMQ Network Magic number
4242
/// useful for TestNet & DevNet
4343
#[cfg(feature = "future_dmq")]
44-
#[clap(long, env = "NETWORK_MAGIC")]
45-
pub network_magic: Option<u64>,
44+
#[clap(long, env = "DMQ_NETWORK_MAGIC")]
45+
pub dmq_network_magic: Option<u64>,
4646

4747
/// Aggregator endpoint URL.
4848
#[clap(long, env = "AGGREGATOR_ENDPOINT")]
@@ -57,15 +57,14 @@ impl AggregatorCommand {
5757
let addr: Multiaddr = format!("/ip4/0.0.0.0/tcp/{}", self.listen_port).parse()?;
5858
let aggregator_endpoint = self.aggregator_endpoint.to_owned();
5959
#[cfg(feature = "future_dmq")]
60-
let cardano_network =
61-
CardanoNetwork::from_code(self.network.to_owned(), self.network_magic)?;
60+
let dmq_network = DmqNetwork::from_code(self.network.to_owned(), self.dmq_network_magic)?;
6261

6362
let mut relay = AggregatorRelay::start(
6463
&addr,
6564
#[cfg(feature = "future_dmq")]
6665
&self.dmq_node_socket_path,
6766
#[cfg(feature = "future_dmq")]
68-
&cardano_network,
67+
&dmq_network,
6968
&aggregator_endpoint,
7069
logger,
7170
)

‎mithril-relay/src/commands/signer.rs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@ use std::time::Duration;
44

55
use clap::Parser;
66
use libp2p::Multiaddr;
7+
78
use slog::error;
89

9-
#[cfg(feature = "future_dmq")]
10-
use mithril_common::CardanoNetwork;
1110
use mithril_common::StdResult;
11+
#[cfg(feature = "future_dmq")]
12+
use mithril_dmq::DmqNetwork;
1213

1314
use crate::{SignerRelay, SignerRelayConfiguration, SignerRelayMode};
1415

@@ -46,8 +47,8 @@ pub struct SignerCommand {
4647
/// Cardano Network Magic number
4748
/// useful for TestNet & DevNet
4849
#[cfg(feature = "future_dmq")]
49-
#[clap(long, env = "NETWORK_MAGIC")]
50-
pub network_magic: Option<u64>,
50+
#[clap(long, env = "DMQ_NETWORK_MAGIC")]
51+
pub dmq_network_magic: Option<u64>,
5152

5253
/// Aggregator endpoint URL.
5354
#[clap(long, env = "AGGREGATOR_ENDPOINT")]
@@ -78,16 +79,15 @@ impl SignerCommand {
7879
let aggregator_endpoint = self.aggregator_endpoint.to_owned();
7980
let signer_repeater_delay = Duration::from_millis(self.signer_repeater_delay);
8081
#[cfg(feature = "future_dmq")]
81-
let cardano_network =
82-
CardanoNetwork::from_code(self.network.to_owned(), self.network_magic)?;
82+
let dmq_network = DmqNetwork::from_code(self.network.to_owned(), self.dmq_network_magic)?;
8383

8484
let mut relay = SignerRelay::start(SignerRelayConfiguration {
8585
address: &addr,
8686
server_port: &server_port,
8787
#[cfg(feature = "future_dmq")]
8888
dmq_node_socket_path: &self.dmq_node_socket_path,
8989
#[cfg(feature = "future_dmq")]
90-
cardano_network: &cardano_network,
90+
dmq_network: &dmq_network,
9191
signer_registration_mode,
9292
signature_registration_mode,
9393
aggregator_endpoint: &aggregator_endpoint,

‎mithril-relay/src/relay/aggregator.rs‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ use std::{path::Path, sync::Arc};
33

44
use anyhow::anyhow;
55
use libp2p::Multiaddr;
6-
#[cfg(feature = "future_dmq")]
7-
use mithril_dmq::{DmqConsumerServer, DmqConsumerServerPallas, DmqMessage};
86
use reqwest::StatusCode;
97
use slog::{Logger, error, info};
108
#[cfg(feature = "future_dmq")]
@@ -13,13 +11,13 @@ use tokio::sync::{
1311
watch::{self, Receiver, Sender},
1412
};
1513

16-
#[cfg(feature = "future_dmq")]
17-
use mithril_common::CardanoNetwork;
1814
use mithril_common::{
1915
StdResult,
2016
logging::LoggerExtensions,
2117
messages::{RegisterSignatureMessageHttp, RegisterSignerMessage},
2218
};
19+
#[cfg(feature = "future_dmq")]
20+
use mithril_dmq::{DmqConsumerServer, DmqConsumerServerPallas, DmqMessage, DmqNetwork};
2321

2422
use crate::p2p::{BroadcastMessage, Peer, PeerEvent};
2523

@@ -39,7 +37,7 @@ impl AggregatorRelay {
3937
pub async fn start(
4038
addr: &Multiaddr,
4139
#[cfg(feature = "future_dmq")] dmq_node_socket_path: &Path,
42-
#[cfg(feature = "future_dmq")] cardano_network: &CardanoNetwork,
40+
#[cfg(feature = "future_dmq")] dmq_network: &DmqNetwork,
4341
aggregator_endpoint: &str,
4442
logger: &Logger,
4543
) -> StdResult<Self> {
@@ -52,7 +50,7 @@ impl AggregatorRelay {
5250
#[cfg(unix)]
5351
let _dmq_consumer_server = Self::start_dmq_consumer_server(
5452
dmq_node_socket_path,
55-
cardano_network,
53+
dmq_network,
5654
signature_dmq_rx,
5755
stop_rx,
5856
logger.clone(),
@@ -88,14 +86,14 @@ impl AggregatorRelay {
8886
#[cfg(feature = "future_dmq")]
8987
async fn start_dmq_consumer_server(
9088
socket: &Path,
91-
cardano_network: &CardanoNetwork,
89+
dmq_network: &DmqNetwork,
9290
signature_dmq_rx: UnboundedReceiver<DmqMessage>,
9391
stop_rx: Receiver<()>,
9492
logger: Logger,
9593
) -> StdResult<Arc<DmqConsumerServerPallas>> {
9694
let dmq_consumer_server = Arc::new(DmqConsumerServerPallas::new(
9795
socket.to_path_buf(),
98-
cardano_network.to_owned(),
96+
dmq_network.to_owned(),
9997
stop_rx,
10098
logger.clone(),
10199
));
@@ -271,7 +269,7 @@ mod tests {
271269
#[cfg(feature = "future_dmq")]
272270
Path::new("test"),
273271
#[cfg(feature = "future_dmq")]
274-
&CardanoNetwork::TestNet(123),
272+
&DmqNetwork::TestNet(123),
275273
&server.url(""),
276274
&TestLogger::stdout(),
277275
)

‎mithril-relay/src/relay/signer.rs‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,13 @@ use tokio::sync::mpsc::{UnboundedReceiver, UnboundedSender, unbounded_channel};
1515
use tokio::sync::watch::{self, Receiver, Sender};
1616
use warp::Filter;
1717

18-
#[cfg(feature = "future_dmq")]
19-
use mithril_common::CardanoNetwork;
2018
use mithril_common::{
2119
StdResult,
2220
logging::LoggerExtensions,
2321
messages::{RegisterSignatureMessageHttp, RegisterSignerMessage},
2422
};
2523
#[cfg(feature = "future_dmq")]
26-
use mithril_dmq::{DmqMessage, DmqPublisherServer, DmqPublisherServerPallas};
24+
use mithril_dmq::{DmqMessage, DmqNetwork, DmqPublisherServer, DmqPublisherServerPallas};
2725
use mithril_test_http_server::{TestHttpServer, test_http_server_with_socket_address};
2826

2927
use crate::{
@@ -67,9 +65,9 @@ pub struct SignerRelayConfiguration<'a> {
6765
/// Path to the DMQ node socket file
6866
#[cfg(feature = "future_dmq")]
6967
pub dmq_node_socket_path: &'a Path,
70-
/// Cardano network
68+
/// DMQ network
7169
#[cfg(feature = "future_dmq")]
72-
pub cardano_network: &'a CardanoNetwork,
70+
pub dmq_network: &'a DmqNetwork,
7371
/// Signer registration mode
7472
pub signer_registration_mode: &'a SignerRelayMode,
7573
/// Signature registration mode
@@ -129,7 +127,7 @@ impl SignerRelay {
129127
#[cfg(unix)]
130128
let _dmq_publisher_server = Self::start_dmq_publisher_server(
131129
config.dmq_node_socket_path,
132-
config.cardano_network,
130+
config.dmq_network,
133131
signature_dmq_tx,
134132
stop_rx,
135133
relay_logger.clone(),
@@ -171,14 +169,14 @@ impl SignerRelay {
171169
#[cfg(feature = "future_dmq")]
172170
async fn start_dmq_publisher_server(
173171
socket: &Path,
174-
cardano_network: &CardanoNetwork,
172+
dmq_network: &DmqNetwork,
175173
signature_dmq_tx: UnboundedSender<DmqMessage>,
176174
stop_rx: Receiver<()>,
177175
logger: Logger,
178176
) -> StdResult<Arc<DmqPublisherServerPallas>> {
179177
let dmq_publisher_server = Arc::new(DmqPublisherServerPallas::new(
180178
socket.to_path_buf(),
181-
cardano_network.to_owned(),
179+
dmq_network.to_owned(),
182180
stop_rx,
183181
logger.clone(),
184182
));

‎mithril-relay/tests/register_signer_signature.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ use reqwest::StatusCode;
77
use slog::{Drain, Level, Logger};
88
use slog_scope::{error, info};
99

10-
#[cfg(feature = "future_dmq")]
11-
use mithril_common::CardanoNetwork;
1210
use mithril_common::messages::{RegisterSignatureMessageHttp, RegisterSignerMessage};
1311
use mithril_common::test::double::Dummy;
12+
#[cfg(feature = "future_dmq")]
13+
use mithril_dmq::DmqNetwork;
1414
use mithril_relay::{
1515
PassiveRelay, SignerRelay, SignerRelayConfiguration, SignerRelayMode,
1616
p2p::{BroadcastMessage, PeerBehaviourEvent, PeerEvent},
@@ -44,7 +44,7 @@ async fn should_receive_registrations_from_signers_when_subscribed_to_pubsub() {
4444
#[cfg(feature = "future_dmq")]
4545
let dmq_node_socket_path = PathBuf::new();
4646
#[cfg(feature = "future_dmq")]
47-
let cardano_network = CardanoNetwork::TestNet(123);
47+
let dmq_network = DmqNetwork::TestNet(123);
4848
let signer_registration_mode = SignerRelayMode::P2P;
4949
let signature_registration_mode = SignerRelayMode::P2P;
5050
let aggregator_endpoint = "http://0.0.0.0:1234".to_string();
@@ -55,7 +55,7 @@ async fn should_receive_registrations_from_signers_when_subscribed_to_pubsub() {
5555
#[cfg(feature = "future_dmq")]
5656
dmq_node_socket_path: &dmq_node_socket_path,
5757
#[cfg(feature = "future_dmq")]
58-
cardano_network: &cardano_network,
58+
dmq_network: &dmq_network,
5959
signer_registration_mode: &signer_registration_mode,
6060
signature_registration_mode: &signature_registration_mode,
6161
aggregator_endpoint: &aggregator_endpoint,

0 commit comments

Comments
 (0)