Fix logger

Author: randomlogin

.github/workflows/rust.yml

@@ -7,6 +7,44 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  probing-tests:
+    name: Probing Tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout source code
+        uses: actions/checkout@v6
+      - name: Install Rust stable toolchain
+        run: |
+          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile=minimal --default-toolchain stable
+      - name: Enable caching for bitcoind
+        id: cache-bitcoind
+        uses: actions/cache@v5
+        with:
+          path: bin/bitcoind-${{ runner.os }}-${{ runner.arch }}
+          key: bitcoind-29.0-${{ runner.os }}-${{ runner.arch }}
+      - name: Enable caching for electrs
+        id: cache-electrs
+        uses: actions/cache@v5
+        with:
+          path: bin/electrs-${{ runner.os }}-${{ runner.arch }}
+          key: electrs-${{ runner.os }}-${{ runner.arch }}
+      - name: Download bitcoind/electrs
+        if: "steps.cache-bitcoind.outputs.cache-hit != 'true' || steps.cache-electrs.outputs.cache-hit != 'true'"
+        run: |
+          source ./scripts/download_bitcoind_electrs.sh
+          mkdir -p bin
+          mv "$BITCOIND_EXE" bin/bitcoind-${{ runner.os }}-${{ runner.arch }}
+          mv "$ELECTRS_EXE" bin/electrs-${{ runner.os }}-${{ runner.arch }}
+      - name: Set bitcoind/electrs environment variables
+        run: |
+          echo "BITCOIND_EXE=$( pwd )/bin/bitcoind-${{ runner.os }}-${{ runner.arch }}" >> "$GITHUB_ENV"
+          echo "ELECTRS_EXE=$( pwd )/bin/electrs-${{ runner.os }}-${{ runner.arch }}" >> "$GITHUB_ENV"
+      - name: Build
+        run: cargo build --verbose --color always
+      - name: Probing tests
+        run: |
+          RUSTFLAGS="--cfg no_download --cfg cycle_tests" cargo test --test probing_tests -- --nocapture
+
   build:
     strategy:
       matrix:

src/logger.rs

@@ -18,6 +18,8 @@ use chrono::Utc;
 use lightning::ln::types::ChannelId;
 use lightning::types::payment::PaymentHash;
 pub use lightning::util::logger::Level as LogLevel;
+
+use crate::config::DEFAULT_LOG_LEVEL;
 pub(crate) use lightning::util::logger::{Logger as LdkLogger, Record as LdkRecord};
 pub(crate) use lightning::{log_bytes, log_debug, log_error, log_info, log_trace};
 use log::{Level as LogFacadeLevel, Record as LogFacadeRecord};
@@ -181,7 +183,7 @@ pub(crate) enum Writer {
 	/// Forwards logs to the `log` facade.
 	LogFacadeWriter,
 	/// Forwards logs to a custom writer.
-	CustomWriter(Arc<dyn LogWriter>),
+	CustomWriter(Arc<dyn LogWriter>, LogLevel),
 }
 
 impl LogWriter for Writer {
@@ -246,7 +248,7 @@ impl LogWriter for Writer {
 						.build(),
 				);
 			},
-			Writer::CustomWriter(custom_logger) => custom_logger.log(record),
+			Writer::CustomWriter(custom_logger, _) => custom_logger.log(record),
 		}
 	}
 }
@@ -280,7 +282,7 @@ impl Logger {
 	}
 
 	pub fn new_custom_writer(log_writer: Arc<dyn LogWriter>) -> Self {
-		Self { writer: Writer::CustomWriter(log_writer) }
+		Self { writer: Writer::CustomWriter(log_writer, DEFAULT_LOG_LEVEL) }
 	}
 }
 
@@ -296,7 +298,10 @@ impl LdkLogger for Logger {
 			Writer::LogFacadeWriter => {
 				self.writer.log(record.into());
 			},
-			Writer::CustomWriter(_arc) => {
+			Writer::CustomWriter(_arc, max_log_level) => {
+				if record.level < *max_log_level {
+					return;
+				}
 				self.writer.log(record.into());
 			},
 		}

tests/common/logging.rs

@@ -15,7 +15,7 @@ pub(crate) enum TestLogWriter {
 
 impl Default for TestLogWriter {
 	fn default() -> Self {
-		TestLogWriter::FileWriter
+		TestLogWriter::LogFacade
 	}
 }
 

tests/common/mod.rs

@@ -313,9 +313,20 @@ pub(crate) fn random_config(anchor_channels: bool) -> TestConfig {
 
 	let alias = random_node_alias();
 	println!("Setting random LDK node alias: {:?}", alias);
+
+	let alias_label = alias
+		.as_ref()
+		.map(|a| {
+			let end = a.0.iter().position(|&b| b == 0).unwrap_or(a.0.len());
+			String::from_utf8_lossy(&a.0[..end]).into_owned()
+		})
+		.unwrap_or_else(|| "node".to_string());
+
 	node_config.node_alias = alias;
 
-	TestConfig { node_config, ..Default::default() }
+	let log_writer = TestLogWriter::Custom(Arc::new(logging::MultiNodeLogger::new(alias_label)));
+
+	TestConfig { node_config, log_writer, ..Default::default() }
 }
 
 #[cfg(feature = "uniffi")]

tests/probing_tests.rs

@@ -94,7 +94,7 @@ fn build_probe_path(
 				short_channel_id: ch_ab.short_channel_id.unwrap(),
 				channel_features: ChannelFeatures::empty(),
 				fee_msat: 1000,
-				cltv_expiry_delta: 40,
+				cltv_expiry_delta: 72,
 				maybe_announced_channel: true,
 			},
 			RouteHop {
@@ -103,7 +103,7 @@ fn build_probe_path(
 				short_channel_id: ch_bc.short_channel_id.unwrap(),
 				channel_features: ChannelFeatures::empty(),
 				fee_msat: amount_msat,
-				cltv_expiry_delta: 0,
+				cltv_expiry_delta: 72,
 				maybe_announced_channel: true,
 			},
 		],

tests/reorg_test.proptest-regressions

@@ -0,0 +1,7 @@
+# Seeds for failure cases proptest has generated in the past. It is
+# automatically read and these particular cases re-run before any
+# novel cases are generated.
+#
+# It is recommended to check this file in to source control so that
+# everyone who runs the test benefits from these saved cases.
+cc 3e257659bd99fb83b1eccbca7fe71a3551fdd79e30095f3497971cd91e228ae1 # shrinks to reorg_depth = 1, force_close = true