88mod common;
99
1010use common:: {
11- do_channel_full_cycle, expect_channel_pending_event, expect_channel_ready_event, expect_event,
12- expect_payment_received_event, expect_payment_successful_event, generate_blocks_and_wait,
13- open_channel, premine_and_distribute_funds, random_config, setup_bitcoind_and_electrsd,
14- setup_builder, setup_node, setup_two_nodes, wait_for_tx, TestChainSource , TestSyncStore ,
11+ do_channel_full_cycle, expect_channel_pending_event, expect_channel_ready_event, expect_event, expect_payment_received_event, expect_payment_successful_event, generate_blocks_and_wait, init_custom_logger, init_log_logger, open_channel, premine_and_distribute_funds, random_config, setup_bitcoind_and_electrsd, setup_builder, setup_node, setup_two_nodes, wait_for_tx, TestChainSource , TestLogWriter , TestSyncStore
1512} ;
1613
1714use ldk_node:: config:: EsploraSyncConfig ;
1815use ldk_node:: liquidity:: LSPS2ServiceConfig ;
16+
17+ use ldk_node:: logger:: LogLevel ;
1918use ldk_node:: payment:: {
2019 ConfirmationStatus , PaymentDirection , PaymentKind , PaymentStatus , QrPaymentResult ,
2120 SendingParameters ,
@@ -30,6 +29,7 @@ use bitcoincore_rpc::RpcApi;
3029use bitcoin:: hashes:: Hash ;
3130use bitcoin:: Amount ;
3231use lightning_invoice:: { Bolt11InvoiceDescription , Description } ;
32+ use log:: LevelFilter ;
3333
3434use std:: sync:: Arc ;
3535
@@ -1066,7 +1066,7 @@ fn lsps2_client_service_integration() {
10661066 } ;
10671067
10681068 let service_config = random_config ( true ) ;
1069- setup_builder ! ( service_builder, service_config) ;
1069+ setup_builder ! ( service_builder, service_config. node_config ) ;
10701070 service_builder. set_chain_source_esplora ( esplora_url. clone ( ) , Some ( sync_config) ) ;
10711071 service_builder. set_liquidity_provider_lsps2 ( lsps2_service_config) ;
10721072 let service_node = service_builder. build ( ) . unwrap ( ) ;
@@ -1076,14 +1076,14 @@ fn lsps2_client_service_integration() {
10761076 let service_addr = service_node. listening_addresses ( ) . unwrap ( ) . first ( ) . unwrap ( ) . clone ( ) ;
10771077
10781078 let client_config = random_config ( true ) ;
1079- setup_builder ! ( client_builder, client_config) ;
1079+ setup_builder ! ( client_builder, client_config. node_config ) ;
10801080 client_builder. set_chain_source_esplora ( esplora_url. clone ( ) , Some ( sync_config) ) ;
10811081 client_builder. set_liquidity_source_lsps2 ( service_node_id, service_addr, None ) ;
10821082 let client_node = client_builder. build ( ) . unwrap ( ) ;
10831083 client_node. start ( ) . unwrap ( ) ;
10841084
10851085 let payer_config = random_config ( true ) ;
1086- setup_builder ! ( payer_builder, payer_config) ;
1086+ setup_builder ! ( payer_builder, payer_config. node_config ) ;
10871087 payer_builder. set_chain_source_esplora ( esplora_url. clone ( ) , Some ( sync_config) ) ;
10881088 let payer_node = payer_builder. build ( ) . unwrap ( ) ;
10891089 payer_node. start ( ) . unwrap ( ) ;
@@ -1144,3 +1144,34 @@ fn lsps2_client_service_integration() {
11441144 let channel_value_sats = client_node. list_channels ( ) . first ( ) . unwrap ( ) . channel_value_sats ;
11451145 assert_eq ! ( channel_value_sats, expected_channel_size_sat) ;
11461146}
1147+
1148+ #[ test]
1149+ fn facade_logging ( ) {
1150+ let ( _bitcoind, electrsd) = setup_bitcoind_and_electrsd ( ) ;
1151+ let chain_source = TestChainSource :: Esplora ( & electrsd) ;
1152+
1153+ let logger = init_log_logger ( LevelFilter :: Trace ) ;
1154+ let mut config = random_config ( false ) ;
1155+ config. log_writer = TestLogWriter :: LogFacade { max_log_level : LogLevel :: Gossip } ;
1156+
1157+ println ! ( "== Facade logging start ==" ) ;
1158+ let _node = setup_node ( & chain_source, config, None ) ;
1159+ println ! ( "== Facade logging end ==" ) ;
1160+
1161+ assert ! ( !logger. retrieve_logs( ) . is_empty( ) ) ;
1162+ }
1163+
1164+ #[ test]
1165+ fn custom_logging ( ) {
1166+ let ( _bitcoind, electrsd) = setup_bitcoind_and_electrsd ( ) ;
1167+ let chain_source = TestChainSource :: Esplora ( & electrsd) ;
1168+ let logger = init_custom_logger ( ) ;
1169+ let mut config = random_config ( false ) ;
1170+ config. log_writer = TestLogWriter :: Custom ( logger. clone ( ) ) ;
1171+
1172+ println ! ( "== Custom logging start ==" ) ;
1173+ let _node = setup_node ( & chain_source, config, None ) ;
1174+ println ! ( "== Custom logging end ==" ) ;
1175+
1176+ assert ! ( !logger. retrieve_logs( ) . is_empty( ) ) ;
1177+ }
0 commit comments