fix: cleanup a bit

wrappers/fedimint_clientd_rs/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fedimint_clientd_rs"
-version = "0.0.1"
+version = "0.0.2"
 edition = "2021"
 description = "Rust client for hitting the REST endpoints on a fedimint clientd"
 repository = "https://github.com/fedimint/fedimint-clientd"

wrappers/fedimint_clientd_rs/src/client/admin.rs → wrappers/fedimint_clientd_rs/src/client/admin/mod.rs

@@ -1,13 +1,8 @@
-use serde_json::Value;
+pub mod types;
 
-use crate::{
-    options::JoinOptions,
-    types::{
-        DiscoverVersionRequest, DiscoverVersionResponse, FederationIdsResponse, InfoResponse,
-        JoinRequest, JoinResponse, ListOperationsRequest, ListOperationsResponse,
-    },
-    FedimintClient,
-};
+use crate::FedimintClient;
+use serde_json::Value;
+pub use types::*;
 
 impl FedimintClient {
     /// Returns info about each joined federation
@@ -65,7 +60,7 @@ impl FedimintClient {
             Ok(res) => {
                 if options.set_active_federation_id {
                     let _ = self
-                        .set_active_federation_id(
+                        .switch_federation_id(
                             res.clone().this_federation_id,
                             options.use_default_gateway,
                         )

wrappers/fedimint_clientd_rs/src/client/admin/types.rs

@@ -0,0 +1,80 @@
+#![allow(non_snake_case)]
+
+use serde::{Deserialize, Serialize};
+use serde_json::Value;
+use std::collections::HashMap;
+
+use crate::client::types::{FederationInfo, OperationOutput};
+
+#[derive(Debug, Clone, Eq, PartialEq, Serialize, Deserialize)]
+pub struct ListOperationsRequest {
+    pub limit: u64,
+    pub federationId: String,
+}
+
+#[derive(Debug, Clone, Eq, PartialEq, Serialize, Deserialize)]
+pub struct JoinRequest {
+    pub inviteCode: String,
+    pub useManualSecret: bool,
+}
+
+#[derive(Debug, Clone, Eq, PartialEq, Serialize, Deserialize)]
+pub struct DiscoverVersionRequest {
+    pub threshold: usize,
+}
+
+pub type InfoResponse = HashMap<String, FederationInfo>;
+
+pub type DiscoverVersionResponse = HashMap<String, Value>;
+
+#[derive(Debug, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ListOperationsResponse {
+    pub operations: Vec<OperationOutput>,
+}
+
+#[derive(Debug, Clone, Eq, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct FederationIdsResponse {
+    pub federation_ids: Vec<String>,
+}
+
+#[derive(Debug, Clone, Eq, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct JoinResponse {
+    pub this_federation_id: String,
+    pub federation_ids: Vec<String>,
+}
+
+pub struct JoinOptions {
+    pub invite_code: String,
+    pub use_default_gateway: bool,
+    pub set_active_federation_id: bool,
+    pub use_manual_secret: bool,
+}
+
+impl JoinOptions {
+    pub fn new(invite_code: String) -> Self {
+        JoinOptions {
+            invite_code,
+            set_active_federation_id: false,
+            use_default_gateway: false,
+            use_manual_secret: false,
+        }
+    }
+
+    pub fn set_active_federation_id(mut self) -> Self {
+        self.set_active_federation_id = true;
+        self
+    }
+
+    pub fn use_default_gateway(mut self) -> Self {
+        self.use_default_gateway = true;
+        self
+    }
+
+    pub fn use_manual_secret(mut self) -> Self {
+        self.use_manual_secret = true;
+        self
+    }
+}

wrappers/fedimint_clientd_rs/src/client/lightning.rs → wrappers/fedimint_clientd_rs/src/client/lightning/mod.rs

@@ -1,12 +1,8 @@
-use crate::{
-    options::{InvoiceOptions, PayOptions, TweakedInvoiceOptions},
-    types::{
-        AwaitInvoiceRequest, AwaitInvoiceResponse, ClaimPubkeyTweakRequest, CreateInvoiceRequest,
-        CreateInvoiceResponse, CreateTweakedInvoiceRequest, Gateway, LightningPayRequest,
-        LightningPayResponse, LightningPaymentResponse, ListGatewaysRequest,
-    },
-    FedimintClient,
-};
+pub mod types;
+
+use super::types::Gateway;
+use crate::FedimintClient;
+pub use types::*;
 
 impl FedimintClient {
     pub async fn create_invoice(