Move v25 wallet to subdirectory

Move wallet.rs to ./wallet/mod.rs

Split out the into_model() into an into module.

Code move only.

Author: jamillambert

types/src/v25/wallet/into.rs

@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: CC0-1.0
+
+use super::{CreateWallet, LoadWallet, UnloadWallet};
+use crate::model;
+
+impl CreateWallet {
+    /// Converts version specific type to a version nonspecific, more strongly typed type.
+    pub fn into_model(self) -> model::CreateWallet {
+        // As the content of the deprecated `warning` field would be the same as `warnings`, we
+        // simply ignore the field, even in case it's set.
+        model::CreateWallet { name: self.name, warnings: self.warnings.unwrap_or_default() }
+    }
+
+    /// Returns the created wallet name.
+    pub fn name(self) -> String { self.into_model().name }
+}
+
+impl LoadWallet {
+    /// Converts version specific type to a version nonspecific, more strongly typed type.
+    pub fn into_model(self) -> model::LoadWallet {
+        // As the content of the deprecated `warning` field would be the same as `warnings`, we
+        // simply ignore the field, even in case it's set.
+        model::LoadWallet { name: self.name, warnings: self.warnings.unwrap_or_default() }
+    }
+
+    /// Returns the loaded wallet name.
+    pub fn name(self) -> String { self.into_model().name }
+}
+
+impl UnloadWallet {
+    /// Converts version specific type to a version nonspecific, more strongly typed type.
+    pub fn into_model(self) -> model::UnloadWallet {
+        model::UnloadWallet { warnings: self.warnings.unwrap_or_default() }
+    }
+}

types/src/v25/wallet.rs renamed to types/src/v25/wallet/mod.rs

@@ -4,9 +4,9 @@
 //!
 //! Types for methods found under the `== Wallet ==` section of the API docs.
 
-use serde::{Deserialize, Serialize};
+mod into;
 
-use crate::model;
+use serde::{Deserialize, Serialize};
 
 /// Result of the JSON-RPC method `createwallet`.
 ///
@@ -39,17 +39,6 @@ pub struct CreateWallet {
     pub warnings: Option<Vec<String>>,
 }
 
-impl CreateWallet {
-    /// Converts version specific type to a version nonspecific, more strongly typed type.
-    pub fn into_model(self) -> model::CreateWallet {
-        // As the content of the deprecated `warning` field would be the same as `warnings`, we
-        // simply ignore the field, even in case it's set.
-        model::CreateWallet { name: self.name, warnings: self.warnings.unwrap_or_default() }
-    }
-
-    /// Returns the created wallet name.
-    pub fn name(self) -> String { self.into_model().name }
-}
 /// Result of JSON-RPC method `listdescriptors`.
 ///
 /// > List descriptors imported into a descriptor-enabled wallet.
@@ -108,18 +97,6 @@ pub struct LoadWallet {
     pub warnings: Option<Vec<String>>,
 }
 
-impl LoadWallet {
-    /// Converts version specific type to a version nonspecific, more strongly typed type.
-    pub fn into_model(self) -> model::LoadWallet {
-        // As the content of the deprecated `warning` field would be the same as `warnings`, we
-        // simply ignore the field, even in case it's set.
-        model::LoadWallet { name: self.name, warnings: self.warnings.unwrap_or_default() }
-    }
-
-    /// Returns the loaded wallet name.
-    pub fn name(self) -> String { self.into_model().name }
-}
-
 /// Result of the JSON-RPC method `unloadwallet`.
 ///
 /// > unloadwallet ( "wallet_name" load_on_startup )
@@ -141,10 +118,3 @@ pub struct UnloadWallet {
     /// Warning messages, if any, related to loading the wallet.
     pub warnings: Option<Vec<String>>,
 }
-
-impl UnloadWallet {
-    /// Converts version specific type to a version nonspecific, more strongly typed type.
-    pub fn into_model(self) -> model::UnloadWallet {
-        model::UnloadWallet { warnings: self.warnings.unwrap_or_default() }
-    }
-}