chore: clippy + reorder

Author: Evalir

src/bundle.rs

@@ -21,34 +21,24 @@ pub struct ZenithEthBundle {
     pub host_fills: Option<SignedOrder>,
 }
 
-/// Response for `zenith_sendBundle`
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ZenithEthBundleResponse {
-    /// The bundle hash of the sent bundle.
-    ///
-    /// This is calculated as keccak256(tx_hashes) where tx_hashes are the concatenated transaction hashes.
-    pub bundle_hash: B256,
-}
-
 impl ZenithEthBundle {
     /// Returns the transactions in this bundle.
     pub fn txs(&self) -> &[Bytes] {
         &self.bundle.txs
     }
 
     /// Returns the block number for this bundle.
-    pub fn block_number(&self) -> u64 {
+    pub const fn block_number(&self) -> u64 {
         self.bundle.block_number
     }
 
     /// Returns the minimum timestamp for this bundle.
-    pub fn min_timestamp(&self) -> Option<u64> {
+    pub const fn min_timestamp(&self) -> Option<u64> {
         self.bundle.min_timestamp
     }
 
     /// Returns the maximum timestamp for this bundle.
-    pub fn max_timestamp(&self) -> Option<u64> {
+    pub const fn max_timestamp(&self) -> Option<u64> {
         self.bundle.max_timestamp
     }
 
@@ -63,6 +53,16 @@ impl ZenithEthBundle {
     }
 }
 
+/// Response for `zenith_sendBundle`
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ZenithEthBundleResponse {
+    /// The bundle hash of the sent bundle.
+    ///
+    /// This is calculated as keccak256(tx_hashes) where tx_hashes are the concatenated transaction hashes.
+    pub bundle_hash: B256,
+}
+
 /// Bundle of transactions for `zenith_callBundle`
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
@@ -76,18 +76,9 @@ pub struct ZenithCallBundle {
     pub host_fills: BTreeMap<Address, BTreeMap<Address, U256>>,
 }
 
-/// Response for `zenith_callBundle`
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Default)]
-#[serde(rename_all = "camelCase")]
-pub struct ZenithCallBundleResponse {
-    /// The flattened "vanilla" response which comes from `eth_callBundle`
-    #[serde(flatten)]
-    pub response: EthCallBundleResponse,
-}
-
 impl ZenithCallBundle {
     /// Returns the host fills for this bundle.
-    pub fn host_fills(&self) -> &BTreeMap<Address, BTreeMap<Address, U256>> {
+    pub const fn host_fills(&self) -> &BTreeMap<Address, BTreeMap<Address, U256>> {
         &self.host_fills
     }
 
@@ -97,32 +88,32 @@ impl ZenithCallBundle {
     }
 
     /// Returns the block number for this bundle.
-    pub fn block_number(&self) -> u64 {
+    pub const fn block_number(&self) -> u64 {
         self.bundle.block_number
     }
 
     /// Returns the state block number for this bundle.
-    pub fn state_block_number(&self) -> BlockNumberOrTag {
+    pub const fn state_block_number(&self) -> BlockNumberOrTag {
         self.bundle.state_block_number
     }
 
     /// Returns the timestamp for this bundle.
-    pub fn timestamp(&self) -> Option<u64> {
+    pub const fn timestamp(&self) -> Option<u64> {
         self.bundle.timestamp
     }
 
     /// Returns the gas limit for this bundle.
-    pub fn gas_limit(&self) -> Option<u64> {
+    pub const fn gas_limit(&self) -> Option<u64> {
         self.bundle.gas_limit
     }
 
     /// Returns the difficulty for this bundle.
-    pub fn difficulty(&self) -> Option<U256> {
+    pub const fn difficulty(&self) -> Option<U256> {
         self.bundle.difficulty
     }
 
     /// Returns the base fee for this bundle.
-    pub fn base_fee(&self) -> Option<u128> {
+    pub const fn base_fee(&self) -> Option<u128> {
         self.bundle.base_fee
     }
 
@@ -230,7 +221,7 @@ impl ZenithCallBundle {
     /// The tx_preimage is calculated as `keccak(tx_hash1 + tx_hash2 + ... + tx_hashn)`.
     /// The host_preimage is calculated as
     /// `keccak(NUM_OF_ASSETS_LE + asset1 + NUM_OF_FILLS_LE + asset1_user1 + user1_amount2 + ... + asset1_usern + asset1_amountn + ...)`.
-    /// For the number of users/fills and amounts amounts in the host_preimage, the amounts are serialized as little-endian U256 slice.
+    /// For the number of users/fills and amounts in the host_preimage, the amounts are serialized as little-endian U256 slice.
     pub fn bundle_hash(&self) -> B256 {
         let mut hasher = alloy_primitives::Keccak256::new();
 
@@ -277,3 +268,12 @@ impl ZenithCallBundle {
         pre_image.finalize()
     }
 }
+
+/// Response for `zenith_callBundle`
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Default)]
+#[serde(rename_all = "camelCase")]
+pub struct ZenithCallBundleResponse {
+    /// The flattened "vanilla" response which comes from `eth_callBundle`
+    #[serde(flatten)]
+    pub response: EthCallBundleResponse,
+}