split rate limit

Author: joostjager

src/static_invoice_store.rs

@@ -8,7 +8,8 @@ use std::{
 
 pub(crate) struct StaticInvoiceStore {
 	kv_store: Arc<DynStore>,
-	rate_limiter: Mutex<RateLimiter>,
+	request_rate_limiter: Mutex<RateLimiter>,
+	persist_rate_limiter: Mutex<RateLimiter>,
 }
 
 impl StaticInvoiceStore {
@@ -19,11 +20,17 @@ impl StaticInvoiceStore {
 	const PRIMARY_NAMESPACE: &str = "static_invoices";
 
 	pub(crate) fn new(kv_store: Arc<DynStore>) -> Self {
-		Self { kv_store, rate_limiter: Mutex::new(RateLimiter::new(Duration::from_millis(100))) }
+		Self {
+			kv_store,
+			request_rate_limiter: Mutex::new(RateLimiter::new(Duration::from_millis(100))),
+			persist_rate_limiter: Mutex::new(RateLimiter::new(Duration::from_millis(100))),
+		}
 	}
 
-	fn check_rate_limit(&self, recipient_id: &[u8]) -> Result<(), lightning::io::Error> {
-		let mut limiter = self.rate_limiter.lock().unwrap();
+	fn check_rate_limit(
+		limiter: &Mutex<RateLimiter>, recipient_id: &[u8],
+	) -> Result<(), lightning::io::Error> {
+		let mut limiter = limiter.lock().unwrap();
 		if !limiter.allow(recipient_id) {
 			Err(lightning::io::Error::new(lightning::io::ErrorKind::Other, "Rate limit exceeded"))
 		} else {
@@ -34,7 +41,7 @@ impl StaticInvoiceStore {
 	pub(crate) async fn handle_static_invoice_requested(
 		&self, recipient_id: Vec<u8>, invoice_slot: u16,
 	) -> Result<Option<StaticInvoice>, lightning::io::Error> {
-		self.check_rate_limit(&recipient_id)?;
+		Self::check_rate_limit(&self.request_rate_limiter, &recipient_id)?;
 
 		let (secondary_namespace, key) = Self::get_storage_location(invoice_slot, recipient_id);
 
@@ -51,7 +58,7 @@ impl StaticInvoiceStore {
 	pub(crate) async fn handle_persist_static_invoice(
 		&self, invoice: StaticInvoice, invoice_slot: u16, recipient_id: Vec<u8>,
 	) -> Result<(), lightning::io::Error> {
-		self.check_rate_limit(&recipient_id)?;
+		Self::check_rate_limit(&self.persist_rate_limiter, &recipient_id)?;
 
 		let (secondary_namespace, key) = Self::get_storage_location(invoice_slot, recipient_id);