@@ -1005,9 +1005,7 @@ mod tests {
1005
1005
//! An iroh node that just has the blobs transport
1006
1006
use std:: { path:: Path , sync:: Arc } ;
1007
1007
1008
- use iroh_net:: {
1009
- discovery:: Discovery , dns:: DnsResolver , key:: SecretKey , NodeAddr , NodeId , RelayMode ,
1010
- } ;
1008
+ use iroh_net:: { NodeAddr , NodeId } ;
1011
1009
use quic_rpc:: transport:: { Connector , Listener } ;
1012
1010
use tokio_util:: task:: AbortOnDropHandle ;
1013
1011
@@ -1034,56 +1032,22 @@ mod tests {
1034
1032
pub struct Builder < S > {
1035
1033
store : S ,
1036
1034
events : EventSender ,
1037
- secret_key : Option < SecretKey > ,
1038
- dns_resolver : Option < DnsResolver > ,
1039
- node_discovery : Option < Box < dyn Discovery > > ,
1040
- insecure_skip_relay_cert_verify : bool ,
1041
- relay_mode : RelayMode ,
1035
+ endpoint : Option < iroh_net:: endpoint:: Builder > ,
1042
1036
}
1043
1037
1044
1038
impl < S : crate :: store:: Store > Builder < S > {
1045
- /// Sets the relay mode
1046
- pub fn relay_mode ( self , mode : RelayMode ) -> Self {
1047
- Self {
1048
- relay_mode : mode,
1049
- ..self
1050
- }
1051
- }
1052
-
1053
- /// Skip relay certificate verification
1054
- pub fn insecure_skip_relay_cert_verify ( self , value : bool ) -> Self {
1055
- Self {
1056
- insecure_skip_relay_cert_verify : value,
1057
- ..self
1058
- }
1059
- }
1060
-
1061
- pub fn dns_resolver ( self , value : DnsResolver ) -> Self {
1062
- Self {
1063
- dns_resolver : Some ( value) ,
1064
- ..self
1065
- }
1066
- }
1067
-
1068
- pub fn node_discovery ( self , value : Box < dyn Discovery > ) -> Self {
1069
- Self {
1070
- node_discovery : Some ( value) ,
1071
- ..self
1072
- }
1073
- }
1074
-
1075
- /// Sets the secret key
1076
- pub fn secret_key ( self , secret_key : SecretKey ) -> Self {
1039
+ /// Sets the event sender
1040
+ pub fn blobs_events ( self , events : impl CustomEventSender ) -> Self {
1077
1041
Self {
1078
- secret_key : Some ( secret_key ) ,
1042
+ events : events . into ( ) ,
1079
1043
..self
1080
1044
}
1081
1045
}
1082
1046
1083
- /// Sets the event sender
1084
- pub fn blobs_events ( self , events : impl CustomEventSender ) -> Self {
1047
+ /// Set an endpoint builder
1048
+ pub fn endpoint ( self , endpoint : iroh_net :: endpoint :: Builder ) -> Self {
1085
1049
Self {
1086
- events : events . into ( ) ,
1050
+ endpoint : Some ( endpoint ) ,
1087
1051
..self
1088
1052
}
1089
1053
}
@@ -1109,27 +1073,11 @@ mod tests {
1109
1073
) > {
1110
1074
let store = self . store ;
1111
1075
let events = self . events ;
1112
- let builder = iroh_net:: Endpoint :: builder ( )
1113
- . discovery_n0 ( )
1114
- . insecure_skip_relay_cert_verify ( self . insecure_skip_relay_cert_verify )
1115
- . relay_mode ( self . relay_mode ) ;
1116
- let builder = if let Some ( secret_key) = self . secret_key {
1117
- builder. secret_key ( secret_key)
1118
- } else {
1119
- builder
1120
- } ;
1121
- let builder = if let Some ( dns_resolver) = self . dns_resolver {
1122
- builder. dns_resolver ( dns_resolver)
1123
- } else {
1124
- builder
1125
- } ;
1126
- let builder = if let Some ( node_discovery) = self . node_discovery {
1127
- builder. discovery ( node_discovery)
1128
- } else {
1129
- builder
1130
- } ;
1131
-
1132
- let endpoint = builder. bind ( ) . await ?;
1076
+ let endpoint = self
1077
+ . endpoint
1078
+ . unwrap_or_else ( || iroh_net:: Endpoint :: builder ( ) . discovery_n0 ( ) )
1079
+ . bind ( )
1080
+ . await ?;
1133
1081
let local_pool = LocalPool :: single ( ) ;
1134
1082
let mut router = iroh_router:: Router :: builder ( endpoint. clone ( ) ) ;
1135
1083
@@ -1187,11 +1135,7 @@ mod tests {
1187
1135
Builder {
1188
1136
store : crate :: store:: mem:: Store :: new ( ) ,
1189
1137
events : Default :: default ( ) ,
1190
- secret_key : None ,
1191
- relay_mode : RelayMode :: Default ,
1192
- insecure_skip_relay_cert_verify : false ,
1193
- dns_resolver : None ,
1194
- node_discovery : None ,
1138
+ endpoint : None ,
1195
1139
}
1196
1140
}
1197
1141
@@ -1202,11 +1146,7 @@ mod tests {
1202
1146
Ok ( Builder {
1203
1147
store : crate :: store:: fs:: Store :: load ( path) . await ?,
1204
1148
events : Default :: default ( ) ,
1205
- secret_key : None ,
1206
- relay_mode : RelayMode :: Default ,
1207
- insecure_skip_relay_cert_verify : false ,
1208
- dns_resolver : None ,
1209
- node_discovery : None ,
1149
+ endpoint : None ,
1210
1150
} )
1211
1151
}
1212
1152
@@ -1960,16 +1900,14 @@ mod tests {
1960
1900
let _guard = iroh_test:: logging:: setup ( ) ;
1961
1901
let ( relay_map, relay_url, _guard) = iroh_net:: test_utils:: run_relay_server ( ) . await ?;
1962
1902
1963
- let node1 = Node :: memory ( )
1903
+ let endpoint1 = iroh_net :: Endpoint :: builder ( )
1964
1904
. relay_mode ( RelayMode :: Custom ( relay_map. clone ( ) ) )
1965
- . insecure_skip_relay_cert_verify ( true )
1966
- . spawn ( )
1967
- . await ?;
1968
- let node2 = Node :: memory ( )
1905
+ . insecure_skip_relay_cert_verify ( true ) ;
1906
+ let node1 = Node :: memory ( ) . endpoint ( endpoint1) . spawn ( ) . await ?;
1907
+ let endpoint2 = iroh_net:: Endpoint :: builder ( )
1969
1908
. relay_mode ( RelayMode :: Custom ( relay_map. clone ( ) ) )
1970
- . insecure_skip_relay_cert_verify ( true )
1971
- . spawn ( )
1972
- . await ?;
1909
+ . insecure_skip_relay_cert_verify ( true ) ;
1910
+ let node2 = Node :: memory ( ) . endpoint ( endpoint2) . spawn ( ) . await ?;
1973
1911
let AddOutcome { hash, .. } = node1. blobs ( ) . add_bytes ( b"foo" . to_vec ( ) ) . await ?;
1974
1912
1975
1913
// create a node addr with only a relay URL, no direct addresses
@@ -1995,23 +1933,21 @@ mod tests {
1995
1933
let dns_pkarr_server = DnsPkarrServer :: run ( ) . await ?;
1996
1934
1997
1935
let secret1 = SecretKey :: generate ( ) ;
1998
- let node1 = Node :: memory ( )
1999
- . secret_key ( secret1. clone ( ) )
1936
+ let endpoint1 = iroh_net:: Endpoint :: builder ( )
2000
1937
. relay_mode ( RelayMode :: Custom ( relay_map. clone ( ) ) )
2001
1938
. insecure_skip_relay_cert_verify ( true )
2002
1939
. dns_resolver ( dns_pkarr_server. dns_resolver ( ) )
2003
- . node_discovery ( dns_pkarr_server . discovery ( secret1 ) )
2004
- . spawn ( )
2005
- . await ?;
1940
+ . secret_key ( secret1 . clone ( ) )
1941
+ . discovery ( dns_pkarr_server . discovery ( secret1 ) ) ;
1942
+ let node1 = Node :: memory ( ) . endpoint ( endpoint1 ) . spawn ( ) . await ?;
2006
1943
let secret2 = SecretKey :: generate ( ) ;
2007
- let node2 = Node :: memory ( )
2008
- . secret_key ( secret2. clone ( ) )
1944
+ let endpoint2 = iroh_net:: Endpoint :: builder ( )
2009
1945
. relay_mode ( RelayMode :: Custom ( relay_map. clone ( ) ) )
2010
1946
. insecure_skip_relay_cert_verify ( true )
2011
1947
. dns_resolver ( dns_pkarr_server. dns_resolver ( ) )
2012
- . node_discovery ( dns_pkarr_server . discovery ( secret2 ) )
2013
- . spawn ( )
2014
- . await ?;
1948
+ . secret_key ( secret2 . clone ( ) )
1949
+ . discovery ( dns_pkarr_server . discovery ( secret2 ) ) ;
1950
+ let node2 = Node :: memory ( ) . endpoint ( endpoint2 ) . spawn ( ) . await ?;
2015
1951
let hash = node1. blobs ( ) . add_bytes ( b"foo" . to_vec ( ) ) . await ?. hash ;
2016
1952
2017
1953
// create a node addr with node id only
0 commit comments