From: Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Date: Thu, 2 Jun 2022 23:53:32 +0000 (-0700)
Subject: Merge pull request #1159 from jkczyz/2021-11-network-gossip
X-Git-Tag: v0.0.107~3
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=0017bc88a84fa7f253bede430fbb147f6e60c50b;p=rust-lightning

Merge pull request #1159 from jkczyz/2021-11-network-gossip

Rename network-related types
---

0017bc88a84fa7f253bede430fbb147f6e60c50b
diff --cc lightning/src/ln/priv_short_conf_tests.rs
index bc430fe52,13f66805b..051703a7f
--- a/lightning/src/ln/priv_short_conf_tests.rs
+++ b/lightning/src/ln/priv_short_conf_tests.rs
@@@ -15,11 -15,11 +15,11 @@@ use chain::{ChannelMonitorUpdateErr, Wa
  use chain::channelmonitor::ChannelMonitor;
  use chain::keysinterface::{Recipient, KeysInterface};
  use ln::channelmanager::{ChannelManager, ChannelManagerReadArgs, MIN_CLTV_EXPIRY_DELTA};
- use routing::network_graph::RoutingFees;
+ use routing::gossip::RoutingFees;
  use routing::router::{PaymentParameters, RouteHint, RouteHintHop};
 -use ln::features::{InitFeatures, InvoiceFeatures};
 +use ln::features::{InitFeatures, InvoiceFeatures, ChannelTypeFeatures};
  use ln::msgs;
 -use ln::msgs::{ChannelMessageHandler, RoutingMessageHandler, OptionalField, ChannelUpdate};
 +use ln::msgs::{ChannelMessageHandler, RoutingMessageHandler, OptionalField, ChannelUpdate, ErrorAction};
  use ln::wire::Encode;
  use util::enforcing_trait_impls::EnforcingSigner;
  use util::events::{ClosureReason, Event, MessageSendEvent, MessageSendEventsProvider};