projects
/
rust-lightning
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #965 from TheBlueMatt/2021-06-log-cleanups
[rust-lightning]
/
lightning
/
src
/
routing
/
router.rs
diff --git
a/lightning/src/routing/router.rs
b/lightning/src/routing/router.rs
index 06bf581c5457acc594805393d444c5b0d98dac44..b12b960d5d3a5d34374205b4eedfcc8cee79e46e 100644
(file)
--- a/
lightning/src/routing/router.rs
+++ b/
lightning/src/routing/router.rs
@@
-49,13
+49,13
@@
pub struct RouteHop {
}
impl_writeable_tlv_based!(RouteHop, {
}
impl_writeable_tlv_based!(RouteHop, {
- (0, pubkey),
- (2, node_features),
- (4, short_channel_id),
- (6, channel_features),
- (8, fee_msat),
- (10, cltv_expiry_delta),
-}
, {}, {}
);
+ (0, pubkey
, required
),
+ (2, node_features
, required
),
+ (4, short_channel_id
, required
),
+ (6, channel_features
, required
),
+ (8, fee_msat
, required
),
+ (10, cltv_expiry_delta
, required
),
+});
/// A route directs a payment from the sender (us) to the recipient. If the recipient supports MPP,
/// it can take multiple paths. Each path is composed of one or more hops through the network.
/// A route directs a payment from the sender (us) to the recipient. If the recipient supports MPP,
/// it can take multiple paths. Each path is composed of one or more hops through the network.
@@
-83,7
+83,7
@@
impl Writeable for Route {
hop.write(writer)?;
}
}
hop.write(writer)?;
}
}
- write_tlv_fields!(writer, {}
, {}
);
+ write_tlv_fields!(writer, {});
Ok(())
}
}
Ok(())
}
}
@@
-101,7
+101,7
@@
impl Readable for Route {
}
paths.push(hops);
}
}
paths.push(hops);
}
- read_tlv_fields!(reader, {}
, {}
);
+ read_tlv_fields!(reader, {});
Ok(Route { paths })
}
}
Ok(Route { paths })
}
}