review: make SwapVersion::version u8

KomodoPlatform · Feb 5, 2025 · bab63f1 · bab63f1
1 parent e833c27
commit bab63f1
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/mm2src/mm2_main/src/lp_ordermatch.rs b/mm2src/mm2_main/src/lp_ordermatch.rs
@@ -136,7 +136,7 @@ const TRIE_ORDER_HISTORY_TIMEOUT: u64 = 300;
 #[cfg(test)]
 const TRIE_ORDER_HISTORY_TIMEOUT: u64 = 3;
 /// Current swap protocol version
-const SWAP_VERSION: u32 = 2;
+const SWAP_VERSION: u8 = 2;
 
 pub type OrderbookP2PHandlerResult = Result<(), MmError<OrderbookP2PHandlerError>>;
 
@@ -1267,7 +1267,7 @@ pub struct TakerOrderBuilder<'a> {
     min_volume: Option<MmNumber>,
     timeout: u64,
     save_in_history: bool,
-    swap_version: u32,
+    swap_version: u8,
 }
 
 pub enum TakerOrderBuildError {
@@ -1723,7 +1723,7 @@ pub struct MakerOrderBuilder<'a> {
     rel_orderbook_ticker: Option<String>,
     conf_settings: Option<OrderConfirmationsSettings>,
     save_in_history: bool,
-    swap_version: u32,
+    swap_version: u8,
 }
 
 pub enum MakerOrderBuildError {

diff --git a/mm2src/mm2_main/src/lp_swap/maker_swap_v2.rs b/mm2src/mm2_main/src/lp_swap/maker_swap_v2.rs
@@ -282,7 +282,7 @@ pub struct MakerSwapDbRepr {
     /// Taker's P2P pubkey
     pub taker_p2p_pub: Secp256k1PubkeySerialize,
     /// Swap protocol version
-    pub swap_version: u32,
+    pub swap_version: u8,
 }
 
 impl StateMachineDbRepr for MakerSwapDbRepr {
@@ -397,7 +397,7 @@ pub struct MakerSwapStateMachine<MakerCoin: MmCoin + MakerCoinSwapOpsV2, TakerCo
     /// Determines if the taker payment spend transaction must be confirmed before marking swap as Completed.
     pub require_taker_payment_spend_confirm: bool,
     /// Swap protocol version
-    pub swap_version: u32,
+    pub swap_version: u8,
 }
 
 impl<MakerCoin: MmCoin + MakerCoinSwapOpsV2, TakerCoin: MmCoin + TakerCoinSwapOpsV2>

diff --git a/mm2src/mm2_main/src/lp_swap/swap_v2_rpcs.rs b/mm2src/mm2_main/src/lp_swap/swap_v2_rpcs.rs
@@ -108,7 +108,7 @@ pub(crate) struct MySwapForRpc<T> {
     maker_coin_nota: bool,
     taker_coin_confs: i64,
     taker_coin_nota: bool,
-    swap_version: u32,
+    swap_version: u8,
 }
 
 impl<T: DeserializeOwned> MySwapForRpc<T> {

diff --git a/mm2src/mm2_main/src/lp_swap/taker_swap_v2.rs b/mm2src/mm2_main/src/lp_swap/taker_swap_v2.rs
@@ -312,7 +312,7 @@ pub struct TakerSwapDbRepr {
     /// Maker's P2P pubkey
     pub maker_p2p_pub: Secp256k1PubkeySerialize,
     /// Swap protocol version
-    pub swap_version: u32,
+    pub swap_version: u8,
 }
 
 #[cfg(not(target_arch = "wasm32"))]
@@ -429,7 +429,7 @@ pub struct TakerSwapStateMachine<MakerCoin: MmCoin + MakerCoinSwapOpsV2, TakerCo
     /// Determines if the maker payment spend transaction must be confirmed before marking swap as Completed.
     pub require_maker_payment_spend_confirm: bool,
     /// Swap protocol version
-    pub swap_version: u32,
+    pub swap_version: u8,
 }
 
 impl<MakerCoin: MmCoin + MakerCoinSwapOpsV2, TakerCoin: MmCoin + TakerCoinSwapOpsV2>

diff --git a/mm2src/mm2_main/src/swap_versioning.rs b/mm2src/mm2_main/src/swap_versioning.rs
@@ -4,7 +4,7 @@
 
 #[derive(Copy, Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
 pub struct SwapVersion {
-    pub version: u32,
+    pub version: u8,
 }
 
 impl Default for SwapVersion {
@@ -19,8 +19,8 @@ impl SwapVersion {
     pub(crate) const fn is_legacy(&self) -> bool { self.version == legacy_swap_version() }
 }
 
-impl From<u32> for SwapVersion {
-    fn from(version: u32) -> Self { Self { version } }
+impl From<u8> for SwapVersion {
+    fn from(version: u8) -> Self { Self { version } }
 }
 
-pub(crate) const fn legacy_swap_version() -> u32 { 1 }
+pub(crate) const fn legacy_swap_version() -> u8 { 1 }