Update net graph copy used in tests and bench for new format

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 341d3819f2392fed27540d56bfe8339fb06d0578..ad9d875214be579eb00c5f4db3c74ccdaf5c7f14 100644 (file)
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -144,12 +144,12 @@ jobs:
         uses: actions/cache@v2
         with:
           path: lightning/net_graph-2021-02-12.bin
-          key: net_graph-2021-02-12
+          key: ldk-net_graph-05f0c5a0d772-2020-02-12.bin
       - name: Fetch routing graph snapshot
         if: steps.cache-graph.outputs.cache-hit != 'true'
         run: |
-          wget -O lightning/net_graph-2021-02-12.bin https://bitcoin.ninja/ldk-net_graph-879e309c128-2020-02-12.bin
-          if [ "$(sha256sum lightning/net_graph-2021-02-12.bin | awk '{ print $1 }')" != "890a1f80dfb6ef674a1e4ff0f23cd73d740731c395f99d85abbede0cfbb701ab" ]; then
+          wget -O lightning/net_graph-2021-02-12.bin https://bitcoin.ninja/ldk-net_graph-05f0c5a0d772-2020-02-12.bin
+          if [ "$(sha256sum lightning/net_graph-2021-02-12.bin | awk '{ print $1 }')" != "7116fca78551fedc714a604cec0ad1ca66caa77bb4d0051290258e7a10e0c6e7" ]; then
             echo "Bad hash"
             exit 1
           fi

diff --git a/lightning/src/routing/router.rs b/lightning/src/routing/router.rs
index 489b900605384a52423547964d89db3113883d0b..1f77681bf06b673de4d44e23f4050ceb6b1beefa 100644 (file)
--- a/lightning/src/routing/router.rs
+++ b/lightning/src/routing/router.rs
@@ -3890,7 +3890,7 @@ mod tests {
                let mut d = match get_route_file() {
                        Ok(f) => f,
                        Err(_) => {
-                               eprintln!("Please fetch https://bitcoin.ninja/ldk-net_graph-879e309c128-2020-02-12.bin and place it at lightning/net_graph-2021-02-12.bin");
+                               eprintln!("Please fetch https://bitcoin.ninja/ldk-net_graph-05f0c5a0d772-2020-02-12.bin and place it at lightning/net_graph-2021-02-12.bin");
                                return;
                        },
                };
@@ -3917,7 +3917,7 @@ mod tests {
                let mut d = match get_route_file() {
                        Ok(f) => f,
                        Err(_) => {
-                               eprintln!("Please fetch https://bitcoin.ninja/ldk-net_graph-879e309c128-2020-02-12.bin and place it at lightning/net_graph-2021-02-12.bin");
+                               eprintln!("Please fetch https://bitcoin.ninja/ldk-net_graph-05f0c5a0d772-2020-02-12.bin and place it at lightning/net_graph-2021-02-12.bin");
                                return;
                        },
                };
@@ -3955,7 +3955,7 @@ mod benches {
        #[bench]
        fn generate_routes(bench: &mut Bencher) {
                let mut d = tests::get_route_file()
-                       .expect("Please fetch https://bitcoin.ninja/ldk-net_graph-879e309c128-2020-02-12.bin and place it at lightning/net_graph-2021-02-12.bin");
+                       .expect("Please fetch https://bitcoin.ninja/ldk-net_graph-05f0c5a0d772-2020-02-12.bin and place it at lightning/net_graph-2021-02-12.bin");
                let graph = NetworkGraph::read(&mut d).unwrap();
 
                // First, get 100 (source, destination) pairs for which route-getting actually succeeds...
@@ -3987,7 +3987,7 @@ mod benches {
        #[bench]
        fn generate_mpp_routes(bench: &mut Bencher) {
                let mut d = tests::get_route_file()
-                       .expect("Please fetch https://bitcoin.ninja/ldk-net_graph-879e309c128-2020-02-12.bin and place it at lightning/net_graph-2021-02-12.bin");
+                       .expect("Please fetch https://bitcoin.ninja/ldk-net_graph-05f0c5a0d772-2020-02-12.bin and place it at lightning/net_graph-2021-02-12.bin");
                let graph = NetworkGraph::read(&mut d).unwrap();
 
                // First, get 100 (source, destination) pairs for which route-getting actually succeeds...