Group bitcoin and monero fields together

swap/src/execution_params.rs

@@ -7,10 +7,10 @@ pub struct ExecutionParams {
     pub bob_time_to_act: Duration,
     pub bitcoin_finality_confirmations: u32,
     pub bitcoin_avg_block_time: Duration,
-    pub monero_avg_block_time: Duration,
-    pub monero_finality_confirmations: u32,
     pub bitcoin_cancel_timelock: CancelTimelock,
     pub bitcoin_punish_timelock: PunishTimelock,
+    pub monero_avg_block_time: Duration,
+    pub monero_finality_confirmations: u32,
 }
 
 pub trait GetExecutionParams {
@@ -32,10 +32,10 @@ impl GetExecutionParams for Mainnet {
             bob_time_to_act: 10.minutes(),
             bitcoin_finality_confirmations: 3,
             bitcoin_avg_block_time: 10.minutes(),
-            monero_avg_block_time: 2.minutes(),
-            monero_finality_confirmations: 15,
             bitcoin_cancel_timelock: CancelTimelock::new(72),
             bitcoin_punish_timelock: PunishTimelock::new(72),
+            monero_avg_block_time: 2.minutes(),
+            monero_finality_confirmations: 15,
         }
     }
 }
@@ -46,10 +46,10 @@ impl GetExecutionParams for Testnet {
             bob_time_to_act: 60.minutes(),
             bitcoin_finality_confirmations: 1,
             bitcoin_avg_block_time: 5.minutes(),
-            monero_avg_block_time: 2.minutes(),
-            monero_finality_confirmations: 10,
             bitcoin_cancel_timelock: CancelTimelock::new(12),
             bitcoin_punish_timelock: PunishTimelock::new(6),
+            monero_avg_block_time: 2.minutes(),
+            monero_finality_confirmations: 10,
         }
     }
 }
@@ -60,10 +60,10 @@ impl GetExecutionParams for Regtest {
             bob_time_to_act: 30.seconds(),
             bitcoin_finality_confirmations: 1,
             bitcoin_avg_block_time: 5.seconds(),
-            monero_avg_block_time: 1.seconds(),
-            monero_finality_confirmations: 10,
             bitcoin_cancel_timelock: CancelTimelock::new(100),
             bitcoin_punish_timelock: PunishTimelock::new(50),
+            monero_avg_block_time: 1.seconds(),
+            monero_finality_confirmations: 10,
         }
     }
 }