File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -16,7 +16,7 @@ hex = "0.4"
1616http = " 0.2"
1717jsonrpc-core = " 18"
1818monero = { version = " 0.17" , features = [" serde" ] }
19- reqwest = { version = " 0.11" , features = [" json" ] }
19+ reqwest = { version = " 0.11" , features = [" json" , " socks " ] }
2020serde = { version = " 1" , features = [" derive" ] }
2121serde_json = " 1"
2222tracing = " 0.1"
Original file line number Diff line number Diff line change @@ -83,12 +83,24 @@ pub struct LwsRpcClient {
8383}
8484
8585impl LwsRpcClient {
86- pub fn new ( addr : String ) -> Self {
87- Self {
88- inner : CallerWrapper ( Arc :: new ( RemoteCaller {
89- http_client : reqwest:: ClientBuilder :: new ( ) . build ( ) . unwrap ( ) ,
90- addr,
91- } ) ) ,
86+ pub fn new ( addr : String , proxy : Option < String > ) -> Self {
87+ if let Some ( proxy_address) = proxy {
88+ Self {
89+ inner : CallerWrapper ( Arc :: new ( RemoteCaller {
90+ http_client : reqwest:: Client :: builder ( )
91+ . proxy ( reqwest:: Proxy :: all ( proxy_address) . unwrap ( ) )
92+ . build ( )
93+ . unwrap ( ) ,
94+ addr,
95+ } ) ) ,
96+ }
97+ } else {
98+ Self {
99+ inner : CallerWrapper ( Arc :: new ( RemoteCaller {
100+ http_client : reqwest:: ClientBuilder :: new ( ) . build ( ) . unwrap ( ) ,
101+ addr,
102+ } ) ) ,
103+ }
92104 }
93105 }
94106
Original file line number Diff line number Diff line change @@ -83,6 +83,6 @@ async fn setup_monero() -> (
8383
8484 regtest. generate_blocks ( 100 , address) . await . unwrap ( ) ;
8585 let dhost = env:: var ( "MONERO_DAEMON_HOST" ) . unwrap_or_else ( |_| "localhost" . into ( ) ) ;
86- let lws_client = monero_lws:: LwsRpcClient :: new ( format ! ( "http://{}:38884" , dhost) ) ;
86+ let lws_client = monero_lws:: LwsRpcClient :: new ( format ! ( "http://{}:38884" , dhost) , None ) ;
8787 ( address, viewkey, lws_client, regtest)
8888}
You can’t perform that action at this time.
0 commit comments