Skip to content

Commit 5965fb8

Browse files
committed
Gate Taproot-related todos behind cfg flag.
1 parent 2659a23 commit 5965fb8

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

lightning/src/ln/channel.rs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2145,6 +2145,7 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
21452145
.map(|(sig, _)| sig).ok()?
21462146
},
21472147
// TODO (taproot|arik)
2148+
#[cfg(taproot)]
21482149
_ => todo!()
21492150
};
21502151

@@ -2199,6 +2200,7 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
21992200
(counterparty_initial_commitment_tx, funding_signed)
22002201
},
22012202
// TODO (taproot|arik)
2203+
#[cfg(taproot)]
22022204
_ => todo!()
22032205
}
22042206
}
@@ -3492,6 +3494,7 @@ impl<SP: Deref> Channel<SP> where
34923494
).map_err(|_| ChannelError::Close("Failed to validate revocation from peer".to_owned()))?;
34933495
},
34943496
// TODO (taproot|arik)
3497+
#[cfg(taproot)]
34953498
_ => todo!()
34963499
};
34973500

@@ -4447,6 +4450,7 @@ impl<SP: Deref> Channel<SP> where
44474450
}), None, None))
44484451
},
44494452
// TODO (taproot|arik)
4453+
#[cfg(taproot)]
44504454
_ => todo!()
44514455
}
44524456
}
@@ -4700,6 +4704,7 @@ impl<SP: Deref> Channel<SP> where
47004704
}), signed_tx, shutdown_result))
47014705
},
47024706
// TODO (taproot|arik)
4707+
#[cfg(taproot)]
47034708
_ => todo!()
47044709
}
47054710
}
@@ -5333,6 +5338,7 @@ impl<SP: Deref> Channel<SP> where
53335338
})
53345339
},
53355340
// TODO (taproot|arik)
5341+
#[cfg(taproot)]
53365342
_ => todo!()
53375343
}
53385344
}
@@ -5362,6 +5368,7 @@ impl<SP: Deref> Channel<SP> where
53625368
})
53635369
},
53645370
// TODO (taproot|arik)
5371+
#[cfg(taproot)]
53655372
_ => todo!()
53665373
}
53675374
} else {
@@ -5737,6 +5744,7 @@ impl<SP: Deref> Channel<SP> where
57375744
}, (counterparty_commitment_txid, commitment_stats.htlcs_included)))
57385745
},
57395746
// TODO (taproot|arik)
5747+
#[cfg(taproot)]
57405748
_ => todo!()
57415749
}
57425750
}
@@ -9105,7 +9113,7 @@ use crate::ln::channelmanager::{self, HTLCSource, PaymentId};
91059113
assert_eq!(chan_utils::build_commitment_secret(&seed, 1),
91069114
<Vec<u8>>::from_hex("915c75942a26bb3a433a8ce2cb0427c29ec6c1775cfc78328b57f6ba7bfeaa9c").unwrap()[..]);
91079115
}
9108-
9116+
91099117
#[test]
91109118
fn test_key_derivation() {
91119119
// Test vectors from BOLT 3 Appendix E:

0 commit comments

Comments
 (0)