1
- use std:: { sync:: Arc , time:: Duration } ;
1
+ use std:: { path :: PathBuf , sync:: Arc , time:: Duration } ;
2
2
3
3
use libp2p:: { Multiaddr , gossipsub} ;
4
- use mithril_common:: messages:: { RegisterSignatureMessageHttp , RegisterSignerMessage } ;
4
+ use reqwest:: StatusCode ;
5
+ use slog:: { Drain , Level , Logger } ;
6
+ use slog_scope:: { error, info} ;
7
+
8
+ use mithril_common:: {
9
+ CardanoNetwork ,
10
+ messages:: { RegisterSignatureMessageHttp , RegisterSignerMessage } ,
11
+ } ;
5
12
use mithril_relay:: {
6
13
PassiveRelay , SignerRelay , SignerRelayMode ,
7
14
p2p:: { BroadcastMessage , PeerBehaviourEvent , PeerEvent } ,
8
15
} ;
9
- use reqwest:: StatusCode ;
10
- use slog:: { Drain , Level , Logger } ;
11
- use slog_scope:: { error, info} ;
12
16
13
17
// Launch a relay that connects to P2P network. The relay is a peer in the P2P
14
18
// network. The relay sends some signer registrations that must be received by other
@@ -35,13 +39,17 @@ async fn should_receive_registrations_from_signers_when_subscribed_to_pubsub() {
35
39
let total_peers = 1 + total_p2p_client;
36
40
let addr: Multiaddr = "/ip4/0.0.0.0/tcp/0" . parse ( ) . unwrap ( ) ;
37
41
let server_port = 0 ;
42
+ let dmq_node_socket_path = PathBuf :: new ( ) ;
43
+ let cardano_network = CardanoNetwork :: TestNet ( 123 ) ;
38
44
let signer_registration_mode = SignerRelayMode :: P2P ;
39
45
let signature_registration_mode = SignerRelayMode :: P2P ;
40
46
let aggregator_endpoint = "http://0.0.0.0:1234" . to_string ( ) ;
41
47
let signer_repeater_delay = Duration :: from_secs ( 100 ) ;
42
48
let mut signer_relay = SignerRelay :: start (
43
49
& addr,
44
50
& server_port,
51
+ & dmq_node_socket_path,
52
+ & cardano_network,
45
53
& signer_registration_mode,
46
54
& signature_registration_mode,
47
55
& aggregator_endpoint,
@@ -142,15 +150,15 @@ async fn should_receive_registrations_from_signers_when_subscribed_to_pubsub() {
142
150
loop {
143
151
tokio:: select! {
144
152
event = p2p_client1. tick_peer( ) => {
145
- if let Ok ( Some ( BroadcastMessage :: RegisterSigner ( signer_message_received) ) ) = p2p_client1. peer_mut( ) . convert_peer_event_to_message( event. unwrap( ) . unwrap( ) )
153
+ if let Ok ( Some ( BroadcastMessage :: RegisterSignerHttp ( signer_message_received) ) ) = p2p_client1. peer_mut( ) . convert_peer_event_to_message( event. unwrap( ) . unwrap( ) )
146
154
{
147
155
info!( "Test: client1 consumed signer registration" ; "message" => #?signer_message_received) ;
148
156
assert_eq!( signer_message_sent, signer_message_received) ;
149
157
total_peers_has_received_message += 1
150
158
}
151
159
}
152
160
event = p2p_client2. tick_peer( ) => {
153
- if let Ok ( Some ( BroadcastMessage :: RegisterSigner ( signer_message_received) ) ) = p2p_client2. peer_mut( ) . convert_peer_event_to_message( event. unwrap( ) . unwrap( ) )
161
+ if let Ok ( Some ( BroadcastMessage :: RegisterSignerHttp ( signer_message_received) ) ) = p2p_client2. peer_mut( ) . convert_peer_event_to_message( event. unwrap( ) . unwrap( ) )
154
162
{
155
163
info!( "Test: client2 consumed signer registration" ; "message" => #?signer_message_received) ;
156
164
assert_eq!( signer_message_sent, signer_message_received) ;
@@ -189,15 +197,15 @@ async fn should_receive_registrations_from_signers_when_subscribed_to_pubsub() {
189
197
loop {
190
198
tokio:: select! {
191
199
event = p2p_client1. tick_peer( ) => {
192
- if let Ok ( Some ( BroadcastMessage :: RegisterSignature ( signature_message_received) ) ) = p2p_client1. peer_mut( ) . convert_peer_event_to_message( event. unwrap( ) . unwrap( ) )
200
+ if let Ok ( Some ( BroadcastMessage :: RegisterSignatureHttp ( signature_message_received) ) ) = p2p_client1. peer_mut( ) . convert_peer_event_to_message( event. unwrap( ) . unwrap( ) )
193
201
{
194
202
info!( "Test: client1 consumed signature" ; "message" => #?signature_message_received) ;
195
203
assert_eq!( signature_message_sent, signature_message_received) ;
196
204
total_peers_has_received_message += 1
197
205
}
198
206
}
199
207
event = p2p_client2. tick_peer( ) => {
200
- if let Ok ( Some ( BroadcastMessage :: RegisterSignature ( signature_message_received) ) ) = p2p_client2. peer_mut( ) . convert_peer_event_to_message( event. unwrap( ) . unwrap( ) )
208
+ if let Ok ( Some ( BroadcastMessage :: RegisterSignatureHttp ( signature_message_received) ) ) = p2p_client2. peer_mut( ) . convert_peer_event_to_message( event. unwrap( ) . unwrap( ) )
201
209
{
202
210
info!( "Test: client2 consumed signature" ; "message" => #?signature_message_received) ;
203
211
assert_eq!( signature_message_sent, signature_message_received) ;
0 commit comments