From 73576574a9ce3750cabf4898717520210cf72ad2 Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Tue, 1 Jun 2021 02:02:40 +0000 Subject: [PATCH] Update network graph sample used in benchmarks --- .github/workflows/build.yml | 8 ++++---- lightning/src/routing/router.rs | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 61e96169..d24b2be7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -143,13 +143,13 @@ jobs: id: cache-graph uses: actions/cache@v2 with: - path: lightning/net_graph-2021-05-27.bin - key: ldk-net_graph-45d86ead641d-2021-05-27.bin + path: lightning/net_graph-2021-05-31.bin + key: ldk-net_graph-v0.0.15-2021-05-31.bin - name: Fetch routing graph snapshot if: steps.cache-graph.outputs.cache-hit != 'true' run: | - wget -O lightning/net_graph-2021-05-27.bin https://bitcoin.ninja/ldk-net_graph-45d86ead641d-2021-05-27.bin - if [ "$(sha256sum lightning/net_graph-2021-05-27.bin | awk '{ print $1 }')" != "3d6261187cfa583255d978efb908b51c2f4dc4ad9a7160cd2c5263c9a4830121" ]; then + wget -O lightning/net_graph-2021-05-31.bin https://bitcoin.ninja/ldk-net_graph-v0.0.15-2021-05-31.bin + if [ "$(sha256sum lightning/net_graph-2021-05-31.bin | awk '{ print $1 }')" != "05a5361278f68ee2afd086cc04a1f927a63924be451f3221d380533acfacc303" ]; then echo "Bad hash" exit 1 fi diff --git a/lightning/src/routing/router.rs b/lightning/src/routing/router.rs index 6d481651..52ac9b77 100644 --- a/lightning/src/routing/router.rs +++ b/lightning/src/routing/router.rs @@ -3907,8 +3907,8 @@ pub(crate) mod test_utils { use std::fs::File; /// Tries to open a network graph file, or panics with a URL to fetch it. pub(crate) fn get_route_file() -> Result { - let res = File::open("net_graph-2021-05-27.bin") // By default we're run in RL/lightning - .or_else(|_| File::open("lightning/net_graph-2021-05-27.bin")) // We may be run manually in RL/ + let res = File::open("net_graph-2021-05-31.bin") // By default we're run in RL/lightning + .or_else(|_| File::open("lightning/net_graph-2021-05-31.bin")) // We may be run manually in RL/ .or_else(|_| { // Fall back to guessing based on the binary location // path is likely something like .../rust-lightning/target/debug/deps/lightning-... let mut path = std::env::current_exe().unwrap(); @@ -3917,11 +3917,11 @@ pub(crate) mod test_utils { path.pop(); // debug path.pop(); // target path.push("lightning"); - path.push("net_graph-2021-05-27.bin"); + path.push("net_graph-2021-05-31.bin"); eprintln!("{}", path.to_str().unwrap()); File::open(path) }) - .map_err(|_| "Please fetch https://bitcoin.ninja/ldk-net_graph-45d86ead641d-2021-05-27.bin and place it at lightning/net_graph-2021-05-27.bin"); + .map_err(|_| "Please fetch https://bitcoin.ninja/ldk-net_graph-v0.0.15-2021-05-31.bin and place it at lightning/net_graph-2021-05-31.bin"); #[cfg(require_route_graph_test)] return Ok(res.unwrap()); #[cfg(not(require_route_graph_test))] -- 2.30.2