0.7.25

kb_lib/src/db/queries/pool.rs

@@ -53,13 +53,15 @@ LIMIT 1
             .fetch_one(pool)
             .await;
             match id_result {
-                Ok(id) => Ok(id),
-                Err(error) => Err(crate::KbError::Db(format!(
-                    "cannot fetch kb_pools id for address '{}' on sqlite: {}",
-                    dto.address, error
-                ))),
+                Ok(id) => return Ok(id),
+                Err(error) => {
+                    return Err(crate::KbError::Db(format!(
+                        "cannot fetch kb_pools id for address '{}' on sqlite: {}",
+                        dto.address, error
+                    )));
+                },
             }
-        }
+        },
     }
 }
 
@@ -95,19 +97,19 @@ LIMIT 1
                         "cannot read kb_pools '{}' on sqlite: {}",
                         address, error
                     )));
-                }
+                },
             };
             match entity_option {
                 Some(entity) => {
                     let dto_result = crate::KbPoolDto::try_from(entity);
                     match dto_result {
-                        Ok(dto) => Ok(Some(dto)),
-                        Err(error) => Err(error),
+                        Ok(dto) => return Ok(Some(dto)),
+                        Err(error) => return Err(error),
                     }
-                }
-                None => Ok(None),
+                },
+                None => return Ok(None),
             }
-        }
+        },
     }
 }
 
@@ -140,7 +142,7 @@ ORDER BY id ASC
                         "cannot list kb_pools on sqlite: {}",
                         error
                     )));
-                }
+                },
             };
             let mut dtos = std::vec::Vec::new();
             for entity in entities {
@@ -151,8 +153,8 @@ ORDER BY id ASC
                 };
                 dtos.push(dto);
             }
-            Ok(dtos)
-        }
+            return Ok(dtos);
+        },
     }
 }
 
@@ -179,13 +181,7 @@ mod tests {
             .expect("database init must succeed");
         let dex_id = crate::upsert_dex(
             &database,
-            &crate::KbDexDto::new(
-                "raydium".to_string(),
-                "Raydium".to_string(),
-                None,
-                None,
-                true,
-            ),
+            &crate::KbDexDto::new("raydium".to_string(), "Raydium".to_string(), None, None, true),
         )
         .await
         .expect("dex upsert must succeed");
@@ -206,13 +202,8 @@ mod tests {
                 .await
                 .expect("get pool must succeed");
         assert!(pool.is_some());
-        assert_eq!(
-            pool.expect("pool must exist").pool_kind,
-            crate::KbPoolKind::Amm
-        );
-        let pools = crate::list_pools(&database)
-            .await
-            .expect("list pools must succeed");
+        assert_eq!(pool.expect("pool must exist").pool_kind, crate::KbPoolKind::Amm);
+        let pools = crate::list_pools(&database).await.expect("list pools must succeed");
         assert_eq!(pools.len(), 1);
     }
 }