Skip to content
This repository was archived by the owner on Jan 6, 2025. It is now read-only.

Commit 83181ae

Browse files
tnulltnull
committed
DRY up and clean up helper methods
1 parent f45eec7 commit 83181ae

File tree

3 files changed

+30
-65
lines changed

3 files changed

+30
-65
lines changed

‎src/lsps1/client.rs‎

Lines changed: 13 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ where
284284
let mut peer_state_lock = inner_state_lock.lock().unwrap();
285285
peer_state_lock.insert_inbound_channel(channel_id, channel);
286286

287-
let request_id = self.generate_request_id();
287+
let request_id = crate::utils::generate_request_id(&self.entropy_source);
288288
peer_state_lock.insert_request(request_id.clone(), channel_id);
289289

290290
{
@@ -339,7 +339,7 @@ where
339339
}
340340
};
341341

342-
self.enqueue_event(Event::LSPS1Client(LSPS1ClientEvent::GetInfoResponse {
342+
self.pending_events.enqueue(Event::LSPS1Client(LSPS1ClientEvent::GetInfoResponse {
343343
id: channel_id,
344344
request_id,
345345
counterparty_node_id: *counterparty_node_id,
@@ -385,7 +385,7 @@ where
385385
}
386386
};
387387

388-
let request_id = self.generate_request_id();
388+
let request_id = crate::utils::generate_request_id(&self.entropy_source);
389389
peer_state_lock.insert_request(request_id.clone(), channel_id);
390390

391391
{
@@ -454,13 +454,15 @@ where
454454
if total_fees == response.payment.order_total_sat
455455
&& total_fees < max_channel_fees_msat
456456
{
457-
self.enqueue_event(Event::LSPS1Client(LSPS1ClientEvent::DisplayOrder {
458-
id: channel_id,
459-
counterparty_node_id: *counterparty_node_id,
460-
order: response.order,
461-
payment: response.payment,
462-
channel: response.channel,
463-
}));
457+
self.pending_events.enqueue(Event::LSPS1Client(
458+
LSPS1ClientEvent::DisplayOrder {
459+
id: channel_id,
460+
counterparty_node_id: *counterparty_node_id,
461+
order: response.order,
462+
payment: response.payment,
463+
channel: response.channel,
464+
},
465+
));
464466
} else {
465467
peer_state_lock.remove_inbound_channel(channel_id);
466468
return Err(LightningError {
@@ -534,7 +536,7 @@ where
534536
return Err(APIError::APIMisuseError { err: e.err });
535537
}
536538

537-
let request_id = self.generate_request_id();
539+
let request_id = crate::utils::generate_request_id(&self.entropy_source);
538540
peer_state_lock.insert_request(request_id.clone(), channel_id);
539541

540542
{
@@ -645,27 +647,6 @@ where
645647
}
646648
}
647649
}
648-
649-
fn enqueue_event(&self, event: Event) {
650-
self.pending_events.enqueue(event);
651-
}
652-
653-
fn generate_channel_id(&self) -> u128 {
654-
let bytes = self.entropy_source.get_secure_random_bytes();
655-
let mut id_bytes: [u8; 16] = [0; 16];
656-
id_bytes.copy_from_slice(&bytes[0..16]);
657-
u128::from_be_bytes(id_bytes)
658-
}
659-
660-
fn generate_request_id(&self) -> RequestId {
661-
let bytes = self.entropy_source.get_secure_random_bytes();
662-
RequestId(utils::hex_str(&bytes[0..16]))
663-
}
664-
665-
fn generate_order_id(&self) -> OrderId {
666-
let bytes = self.entropy_source.get_secure_random_bytes();
667-
OrderId(utils::hex_str(&bytes[0..16]))
668-
}
669650
}
670651

671652
impl<ES: Deref, CM: Deref + Clone, PM: Deref + Clone, C: Deref> ProtocolMessageHandler

‎src/lsps1/service.rs‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ where
263263
.pending_requests
264264
.insert(request_id.clone(), LSPS1Request::CreateOrder(params.clone()));
265265

266-
self.enqueue_event(Event::LSPS1Service(LSPS1ServiceEvent::CreateInvoice {
266+
self.pending_events.enqueue(Event::LSPS1Service(LSPS1ServiceEvent::CreateInvoice {
267267
request_id,
268268
counterparty_node_id: *counterparty_node_id,
269269
order: params.order,
@@ -351,7 +351,7 @@ where
351351

352352
if let Err(e) = outbound_channel.create_payment_invoice() {
353353
peer_state_lock.outbound_channels_by_order_id.remove(&params.order_id);
354-
self.enqueue_event(Event::LSPS1Service(LSPS1ServiceEvent::Refund {
354+
self.pending_events.enqueue(Event::LSPS1Service(LSPS1ServiceEvent::Refund {
355355
request_id,
356356
counterparty_node_id: *counterparty_node_id,
357357
order_id: params.order_id,
@@ -363,7 +363,7 @@ where
363363
.pending_requests
364364
.insert(request_id.clone(), LSPS1Request::GetOrder(params.clone()));
365365

366-
self.enqueue_event(Event::LSPS1Service(
366+
self.pending_events.enqueue(Event::LSPS1Service(
367367
LSPS1ServiceEvent::CheckPaymentConfirmation {
368368
request_id,
369369
counterparty_node_id: *counterparty_node_id,
@@ -441,15 +441,6 @@ where
441441
}
442442
}
443443

444-
fn enqueue_event(&self, event: Event) {
445-
self.pending_events.enqueue(event);
446-
}
447-
448-
fn generate_request_id(&self) -> RequestId {
449-
let bytes = self.entropy_source.get_secure_random_bytes();
450-
RequestId(utils::hex_str(&bytes[0..16]))
451-
}
452-
453444
fn generate_order_id(&self) -> OrderId {
454445
let bytes = self.entropy_source.get_secure_random_bytes();
455446
OrderId(utils::hex_str(&bytes[0..16]))

‎src/lsps2/client.rs‎

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ where
277277
let mut peer_state_lock = inner_state_lock.lock().unwrap();
278278
peer_state_lock.insert_inbound_channel(jit_channel_id, channel);
279279

280-
let request_id = self.generate_request_id();
280+
let request_id = crate::utils::generate_request_id(&self.entropy_source);
281281
peer_state_lock.insert_request(request_id.clone(), jit_channel_id);
282282

283283
{
@@ -320,7 +320,7 @@ where
320320
}
321321
};
322322

323-
let request_id = self.generate_request_id();
323+
let request_id = crate::utils::generate_request_id(&self.entropy_source);
324324
let payment_size_msat = jit_channel.config.payment_size_msat;
325325
peer_state.insert_request(request_id.clone(), jit_channel_id);
326326

@@ -365,15 +365,6 @@ where
365365
u128::from_be_bytes(id_bytes)
366366
}
367367

368-
fn generate_request_id(&self) -> RequestId {
369-
let bytes = self.entropy_source.get_secure_random_bytes();
370-
RequestId(utils::hex_str(&bytes[0..16]))
371-
}
372-
373-
fn enqueue_event(&self, event: Event) {
374-
self.pending_events.enqueue(event);
375-
}
376-
377368
fn handle_get_versions_response(
378369
&self, request_id: RequestId, counterparty_node_id: &PublicKey, result: GetVersionsResponse,
379370
) -> Result<(), LightningError> {
@@ -412,7 +403,7 @@ where
412403
}
413404
};
414405

415-
let request_id = self.generate_request_id();
406+
let request_id = crate::utils::generate_request_id(&self.entropy_source);
416407
peer_state.insert_request(request_id.clone(), jit_channel_id);
417408

418409
{
@@ -478,14 +469,16 @@ where
478469
return Err(e);
479470
}
480471

481-
self.enqueue_event(Event::LSPS2Client(LSPS2ClientEvent::GetInfoResponse {
482-
counterparty_node_id: *counterparty_node_id,
483-
opening_fee_params_menu: result.opening_fee_params_menu,
484-
min_payment_size_msat: result.min_payment_size_msat,
485-
max_payment_size_msat: result.max_payment_size_msat,
486-
jit_channel_id,
487-
user_channel_id: jit_channel.config.user_id,
488-
}));
472+
self.pending_events.enqueue(Event::LSPS2Client(
473+
LSPS2ClientEvent::GetInfoResponse {
474+
counterparty_node_id: *counterparty_node_id,
475+
opening_fee_params_menu: result.opening_fee_params_menu,
476+
min_payment_size_msat: result.min_payment_size_msat,
477+
max_payment_size_msat: result.max_payment_size_msat,
478+
jit_channel_id,
479+
user_channel_id: jit_channel.config.user_id,
480+
},
481+
));
489482
}
490483
None => {
491484
return Err(LightningError {
@@ -572,7 +565,7 @@ where
572565
}
573566

574567
if let Ok(scid) = result.jit_channel_scid.to_scid() {
575-
self.enqueue_event(Event::LSPS2Client(
568+
self.pending_events.enqueue(Event::LSPS2Client(
576569
LSPS2ClientEvent::InvoiceGenerationReady {
577570
counterparty_node_id: *counterparty_node_id,
578571
scid,

0 commit comments

Comments
 (0)