From ec92e3507f5953c21b6e52b0b07a67ad3071a93e Mon Sep 17 00:00:00 2001
From: neonphog <neonphog@gmail.com>
Date: Fri, 11 Oct 2024 14:01:42 -0600
Subject: [PATCH] merge upstream

---
 crates/tx5/src/backend/mem.rs | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/crates/tx5/src/backend/mem.rs b/crates/tx5/src/backend/mem.rs
index da890c1..add1f1c 100644
--- a/crates/tx5/src/backend/mem.rs
+++ b/crates/tx5/src/backend/mem.rs
@@ -10,17 +10,17 @@ pub async fn connect(
     _config: &Arc<Config>,
     _url: &str,
     _listener: bool,
-) -> Result<(DynBackEp, DynBackEpRecv)> {
+) -> Result<(DynBackEp, DynBackEpRecvCon)> {
     let (ep, ep_recv) = STAT.listen();
     let ep: DynBackEp = ep;
-    let ep_recv: DynBackEpRecv = Box::new(ep_recv);
+    let ep_recv: DynBackEpRecvCon = Box::new(ep_recv);
 
     Ok((ep, ep_recv))
 }
 
-struct ConRecv(tokio::sync::mpsc::UnboundedReceiver<Vec<u8>>);
+struct ConRecvData(tokio::sync::mpsc::UnboundedReceiver<Vec<u8>>);
 
-impl BackConRecv for ConRecv {
+impl BackConRecvData for ConRecvData {
     fn recv(&mut self) -> BoxFuture<'_, Option<Vec<u8>>> {
         Box::pin(async { self.0.recv().await })
     }
@@ -33,12 +33,12 @@ struct Con {
 
 impl Con {
     #[allow(clippy::new_ret_no_self)]
-    pub fn new(pub_key: PubKey) -> (DynBackCon, DynBackConRecv) {
+    pub fn new(pub_key: PubKey) -> (DynBackCon, DynBackConRecvData) {
         let (send, recv) = tokio::sync::mpsc::unbounded_channel();
 
         let con: DynBackCon = Arc::new(Self { pub_key, send });
 
-        let con_recv: DynBackConRecv = Box::new(ConRecv(recv));
+        let con_recv: DynBackConRecvData = Box::new(ConRecvData(recv));
 
         (con, con_recv)
     }
@@ -74,14 +74,14 @@ impl BackCon for Con {
 struct WaitCon {
     pub_key: PubKey,
     con: Option<DynBackCon>,
-    con_recv: Option<DynBackConRecv>,
+    con_recv: Option<DynBackConRecvData>,
 }
 
 impl BackWaitCon for WaitCon {
     fn wait(
         &mut self,
         _recv_limit: Arc<tokio::sync::Semaphore>,
-    ) -> BoxFuture<'static, Result<(DynBackCon, DynBackConRecv)>> {
+    ) -> BoxFuture<'static, Result<(DynBackCon, DynBackConRecvData)>> {
         let con = self.con.take().unwrap();
         let con_recv = self.con_recv.take().unwrap();
         Box::pin(async { Ok((con, con_recv)) })
@@ -92,9 +92,9 @@ impl BackWaitCon for WaitCon {
     }
 }
 
-struct EpRecv(tokio::sync::mpsc::UnboundedReceiver<DynBackWaitCon>);
+struct EpRecvCon(tokio::sync::mpsc::UnboundedReceiver<DynBackWaitCon>);
 
-impl BackEpRecv for EpRecv {
+impl BackEpRecvCon for EpRecvCon {
     fn recv(&mut self) -> BoxFuture<'_, Option<DynBackWaitCon>> {
         Box::pin(async { self.0.recv().await })
     }
@@ -136,7 +136,7 @@ impl Drop for Ep {
 }
 
 impl Ep {
-    pub fn new(uniq: u64, loc: usize) -> (Arc<Self>, EpRecv) {
+    pub fn new(uniq: u64, loc: usize) -> (Arc<Self>, EpRecvCon) {
         let pub_key = gen_pub_key(uniq, loc);
 
         let (send, recv) = tokio::sync::mpsc::unbounded_channel();
@@ -148,7 +148,7 @@ impl Ep {
                 pub_key,
                 send,
             }),
-            EpRecv(recv),
+            EpRecvCon(recv),
         )
     }
 }
@@ -190,7 +190,7 @@ impl Stat {
         }
     }
 
-    pub fn listen(&self) -> (Arc<Ep>, EpRecv) {
+    pub fn listen(&self) -> (Arc<Ep>, EpRecvCon) {
         static UNIQ: std::sync::atomic::AtomicU64 =
             std::sync::atomic::AtomicU64::new(1);
         let uniq = UNIQ.fetch_add(1, std::sync::atomic::Ordering::Relaxed);
@@ -285,7 +285,7 @@ mod tests {
     #[tokio::test(flavor = "multi_thread")]
     async fn mem_backend_e2e() {
         let config = Arc::new(Config {
-            backend_module: BackendModule::Mock,
+            backend_module: BackendModule::Mem,
             ..Default::default()
         });