Merge remote-tracking branch 'origin/fix/contestedDocumentResolutionF…

…ixes6' into test/mn-voting-sdk-2
dashpay · Jul 3, 2024 · 61608bb · 61608bb
2 parents 443fe05 + 98513a9
commit 61608bb
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 20 deletions.
diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/mod.rs
@@ -306,16 +306,12 @@ mod tests {
         let identity_2_info = setup_identity(platform, rng.gen(), dash_to_credits!(0.5));
 
         // Flip them if needed so identity 1 id is always smaller than identity 2 id
-        let (identity_1_info, identity_2_info) =
-            if identity_1_info.0.id() < identity_2_info.0.id() {
-                (
-                    identity_1_info, identity_2_info,
-                )
-            } else {
-                (
-                    identity_2_info, identity_1_info,
-                )
-            };
+        let (identity_1_info, identity_2_info) = if identity_1_info.0.id() < identity_2_info.0.id()
+        {
+            (identity_1_info, identity_2_info)
+        } else {
+            (identity_2_info, identity_1_info)
+        };
 
         let ((preorder_document_1, document_1), (preorder_document_2, document_2), dpns_contract) =
             create_dpns_name_contest_on_identities(
@@ -365,16 +361,12 @@ mod tests {
         let identity_2_info = setup_identity(platform, rng.gen(), dash_to_credits!(0.5));
 
         // Flip them if needed so identity 1 id is always smaller than identity 2 id
-        let (identity_1_info, identity_2_info) =
-            if identity_1_info.0.id() < identity_2_info.0.id() {
-                (
-                    identity_1_info, identity_2_info,
-                )
-            } else {
-                (
-                    identity_2_info, identity_1_info,
-                )
-            };
+        let (identity_1_info, identity_2_info) = if identity_1_info.0.id() < identity_2_info.0.id()
+        {
+            (identity_1_info, identity_2_info)
+        } else {
+            (identity_2_info, identity_1_info)
+        };
 
         let (_, _, dpns_contract) = create_dpns_name_contest_on_identities(
             platform,

diff --git a/packages/rs-drive/src/drive/object_size_info/contract_info.rs b/packages/rs-drive/src/drive/object_size_info/contract_info.rs
@@ -161,6 +161,7 @@ pub enum DataContractResolvedInfo<'a> {
 impl<'a> From<&'a DataContractOwnedResolvedInfo> for DataContractResolvedInfo<'a> {
     fn from(value: &'a DataContractOwnedResolvedInfo) -> Self {
         match value {
+            #[cfg(feature = "server")]
             DataContractOwnedResolvedInfo::DataContractFetchInfo(fetch_info) => {
                 DataContractResolvedInfo::ArcDataContractFetchInfo(fetch_info.clone())
             }