Skip to content

Commit 244ad83

Browse files
authored
Merge pull request #955 from TheBlueMatt/2021-06-rustc-bugz
Fix trivial doc warnings and make CI use old rustc
2 parents 2940099 + f875579 commit 244ad83

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,9 @@ jobs:
165165
check_commits:
166166
runs-on: ubuntu-latest
167167
env:
168-
TOOLCHAIN: stable
168+
# rustc 1.53 regressed and panics when building our (perfectly fine) docs.
169+
# See https://github.com/rust-lang/rust/issues/84738
170+
TOOLCHAIN: 1.52.1
169171
steps:
170172
- name: Checkout source code
171173
uses: actions/checkout@v2

lightning-invoice/src/lib.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,16 @@ const MAX_EXPIRY_TIME: u64 = 60 * 60 * 24 * 356;
6060
/// Default expiry time as defined by [BOLT 11].
6161
///
6262
/// [BOLT 11]: https://github.com/lightningnetwork/lightning-rfc/blob/master/11-payment-encoding.md
63-
const DEFAULT_EXPIRY_TIME: u64 = 3600;
63+
pub const DEFAULT_EXPIRY_TIME: u64 = 3600;
6464

6565
/// Default minimum final CLTV expiry as defined by [BOLT 11].
6666
///
67+
/// Note that this is *not* the same value as rust-lightning's minimum CLTV expiry, which is
68+
/// provided in [`MIN_FINAL_CLTV_EXPIRY`].
69+
///
6770
/// [BOLT 11]: https://github.com/lightningnetwork/lightning-rfc/blob/master/11-payment-encoding.md
68-
const DEFAULT_MIN_FINAL_CLTV_EXPIRY: u64 = 18;
71+
/// [`MIN_FINAL_CLTV_EXPIRY`]: lightning::ln::channelmanager::MIN_FINAL_CLTV_EXPIRY
72+
pub const DEFAULT_MIN_FINAL_CLTV_EXPIRY: u64 = 18;
6973

7074
/// This function is used as a static assert for the size of `SystemTime`. If the crate fails to
7175
/// compile due to it this indicates that your system uses unexpected bounds for `SystemTime`. You

lightning/src/util/message_signing.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
//! Note this is not part of the specs, but follows lnd's signing and verifying protocol, which can is defined as follows:
1313
//!
1414
//! signature = zbase32(SigRec(sha256d(("Lightning Signed Message:" + msg)))
15-
//! zbase32 from https://philzimmermann.com/docs/human-oriented-base-32-encoding.txt
15+
//! zbase32 from <https://philzimmermann.com/docs/human-oriented-base-32-encoding.txt>
1616
//! SigRec has first byte 31 + recovery id, followed by 64 byte sig.
1717
//!
1818
//! This implementation is compatible with both lnd's and c-lightning's
1919
//!
20-
//! https://lightning.readthedocs.io/lightning-signmessage.7.html
21-
//! https://api.lightning.community/#signmessage
20+
//! <https://lightning.readthedocs.io/lightning-signmessage.7.html>
21+
//! <https://api.lightning.community/#signmessage>
2222
2323
use prelude::*;
2424
use crate::util::zbase32;

0 commit comments

Comments
 (0)