Skip to content

Commit 38ecd35

Browse files
committed
Rename AtomicCounter::get_increment to simply next
Its a counter, `next` is super clear, `get_increment` is a bit less so.
1 parent 16d014f commit 38ecd35

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

lightning/src/ln/interactivetxs.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1328,7 +1328,7 @@ mod tests {
13281328
impl EntropySource for TestEntropySource {
13291329
fn get_secure_random_bytes(&self) -> [u8; 32] {
13301330
let mut res = [0u8; 32];
1331-
let increment = self.0.get_increment();
1331+
let increment = self.0.next();
13321332
for (i, byte) in res.iter_mut().enumerate() {
13331333
// Rotate the increment value by 'i' bits to the right, to avoid clashes
13341334
// when `generate_local_serial_id` does a parity flip on consecutive calls for the

lightning/src/ln/peer_handler.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1053,7 +1053,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
10531053

10541054
fn get_ephemeral_key(&self) -> SecretKey {
10551055
let mut ephemeral_hash = self.ephemeral_key_midstate.clone();
1056-
let counter = self.peer_counter.get_increment();
1056+
let counter = self.peer_counter.next();
10571057
ephemeral_hash.input(&counter.to_le_bytes());
10581058
SecretKey::from_slice(&Sha256::from_engine(ephemeral_hash).to_byte_array()).expect("You broke SHA-256!")
10591059
}

lightning/src/sign/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2506,7 +2506,7 @@ impl RandomBytes {
25062506

25072507
impl EntropySource for RandomBytes {
25082508
fn get_secure_random_bytes(&self) -> [u8; 32] {
2509-
let index = self.index.get_increment();
2509+
let index = self.index.next();
25102510
let mut nonce = [0u8; 16];
25112511
nonce[..8].copy_from_slice(&index.to_be_bytes());
25122512
ChaCha20::get_single_block(&self.seed, &nonce)

lightning/src/util/atomic_counter.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ impl AtomicCounter {
2222
counter: Mutex::new(0),
2323
}
2424
}
25-
pub(crate) fn get_increment(&self) -> u64 {
25+
pub(crate) fn next(&self) -> u64 {
2626
#[cfg(target_has_atomic = "64")] {
2727
self.counter.fetch_add(1, Ordering::AcqRel)
2828
}

0 commit comments

Comments
 (0)