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

Rename network-related types

diff --cc lightning/src/ln/channelmanager.rs
Simple merge

diff --cc lightning/src/ln/priv_short_conf_tests.rs
index bc430fe52837c8a2282e6ea2bf929b0b52568a17,13f66805b74b62a9ba66d75cf8384a8a6f567698..051703a7fcc04b2121a82c207cb18bdd99829cb9
--- 1/lightning/src/ln/priv_short_conf_tests.rs
--- 2/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};

diff --cc lightning/src/util/events.rs
Simple merge