fix: build broken after merge of contested unique indexes validation (#…

…1892)
dashpay · Jun 17, 2024 · 42d8573 · 42d8573
1 parent 6ce465d
commit 42d8573
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/packages/rs-dapi-client/Cargo.toml b/packages/rs-dapi-client/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 default = ["mocks", "offline-testing"]
 mocks = ["dep:sha2", "dep:hex", "dapi-grpc/mocks"]
 # dump requests and responses to file
-dump = ["mocks", "dep:chrono"]
+dump = ["mocks"]
 # skip tests that require connection to the platform; enabled by default
 offline-testing = []
 
@@ -22,7 +22,6 @@ thiserror = "1.0.58"
 tracing = "0.1.40"
 tokio = { version = "1.32.0", default-features = false }
 sha2 = { version = "0.10", optional = true }
-chrono = { version = "0.4.31", optional = true }
 hex = { version = "0.4.3", optional = true }
 lru = { version = "0.12.3" }
 

diff --git a/packages/rs-dpp/src/errors/consensus/codes.rs b/packages/rs-dpp/src/errors/consensus/codes.rs
@@ -156,6 +156,7 @@ impl ErrorWithCode for BasicError {
 
             // General Errors 10700-10799
             Self::OverflowError(_) => 10700,
+            Self::ContestedUniqueIndexOnMutableDocumentTypeError(_) => 10701,
         }
     }
 }

diff --git a/packages/rs-platform-version/src/version/mocks/v2_test.rs b/packages/rs-platform-version/src/version/mocks/v2_test.rs
@@ -963,7 +963,11 @@ pub const TEST_PLATFORM_V2: PlatformVersion = PlatformVersion {
                 validate_not_defined_properties: 0,
                 validate_property_definition: 0,
             },
-            document_type: DocumentTypeValidationVersions { validate_update: 0 },
+            document_type: DocumentTypeValidationVersions {
+                validate_update: 0,
+                contested_index_limit: 1,
+                unique_index_limit: 10,
+            },
             voting: VotingValidationVersions {
                 allow_other_contenders_time_ms: 604_800_000, // 1 week in ms
                 votes_allowed_per_masternode: 5,

diff --git a/packages/rs-platform-version/src/version/mocks/v3_test.rs b/packages/rs-platform-version/src/version/mocks/v3_test.rs
@@ -963,7 +963,11 @@ pub const TEST_PLATFORM_V3: PlatformVersion = PlatformVersion {
                 validate_not_defined_properties: 0,
                 validate_property_definition: 0,
             },
-            document_type: DocumentTypeValidationVersions { validate_update: 0 },
+            document_type: DocumentTypeValidationVersions {
+                validate_update: 0,
+                contested_index_limit: 1,
+                unique_index_limit: 10,
+            },
             voting: VotingValidationVersions {
                 allow_other_contenders_time_ms: 604_800_000, // 1 week in ms
                 votes_allowed_per_masternode: 5,

diff --git a/packages/rs-platform-version/src/version/v1.rs b/packages/rs-platform-version/src/version/v1.rs
@@ -962,7 +962,11 @@ pub const PLATFORM_V1: PlatformVersion = PlatformVersion {
                 validate_not_defined_properties: 0,
                 validate_property_definition: 0,
             },
-            document_type: DocumentTypeValidationVersions { validate_update: 0 },
+            document_type: DocumentTypeValidationVersions {
+                validate_update: 0,
+                contested_index_limit: 1,
+                unique_index_limit: 10,
+            },
             voting: VotingValidationVersions {
                 allow_other_contenders_time_ms: 604_800_000, // 1 week in ms
                 votes_allowed_per_masternode: 5,

diff --git a/...rc/errors/consensus/basic/data_contract/index_error/unique_indices_limit_reached_error.rs b/...rc/errors/consensus/basic/data_contract/index_error/unique_indices_limit_reached_error.rs
@@ -23,7 +23,7 @@ impl UniqueIndicesLimitReachedErrorWasm {
     }
 
     #[wasm_bindgen(js_name=getIndexLimit)]
-    pub fn get_index_limit(&self) -> usize {
+    pub fn get_index_limit(&self) -> u16 {
         self.inner.index_limit()
     }
 

diff --git a/packages/wasm-dpp/src/errors/consensus/consensus_error.rs b/packages/wasm-dpp/src/errors/consensus/consensus_error.rs
@@ -61,7 +61,7 @@ use dpp::consensus::state::data_trigger::DataTriggerError::{
     DataTriggerConditionError, DataTriggerExecutionError, DataTriggerInvalidResultError,
 };
 use wasm_bindgen::{JsError, JsValue};
-use dpp::consensus::basic::data_contract::{InvalidDocumentTypeRequiredSecurityLevelError, UnknownDocumentCreationRestrictionModeError, UnknownSecurityLevelError, UnknownStorageKeyRequirementsError, UnknownTradeModeError, UnknownTransferableTypeError};
+use dpp::consensus::basic::data_contract::{ContestedUniqueIndexOnMutableDocumentTypeError, InvalidDocumentTypeRequiredSecurityLevelError, UnknownDocumentCreationRestrictionModeError, UnknownSecurityLevelError, UnknownStorageKeyRequirementsError, UnknownTradeModeError, UnknownTransferableTypeError};
 use dpp::consensus::basic::document::{DocumentCreationNotAllowedError, MaxDocumentsTransitionsExceededError, MissingPositionsInDocumentTypePropertiesError};
 use dpp::consensus::basic::identity::{DataContractBoundsNotPresentError, DisablingKeyIdAlsoBeingAddedInSameTransitionError, InvalidIdentityCreditWithdrawalTransitionAmountError, InvalidIdentityUpdateTransitionDisableKeysError, InvalidIdentityUpdateTransitionEmptyError, TooManyMasterPublicKeyError};
 use dpp::consensus::basic::overflow_error::OverflowError;
@@ -159,6 +159,9 @@ pub fn from_consensus_error_ref(e: &DPPConsensusError) -> JsValue {
         DPPConsensusError::StateError(state_error) => from_state_error(state_error),
         DPPConsensusError::BasicError(basic_error) => from_basic_error(basic_error),
         DPPConsensusError::DefaultError => JsError::new("DefaultError").into(),
+        #[cfg(test)]
+        #[allow(unreachable_patterns)]
+        e => JsError::new(&format!("unsupported error: {:?}", e)).into(),
     }
 }
 
@@ -518,6 +521,9 @@ fn from_basic_error(basic_error: &BasicError) -> JsValue {
             generic_consensus_error!(DocumentCreationNotAllowedError, e).into()
         }
         BasicError::OverflowError(e) => generic_consensus_error!(OverflowError, e).into(),
+        BasicError::ContestedUniqueIndexOnMutableDocumentTypeError(e) => {
+            generic_consensus_error!(ContestedUniqueIndexOnMutableDocumentTypeError, e).into()
+        }
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -156,6 +156,7 @@ impl ErrorWithCode for BasicError { @@
                 // General Errors 10700-10799
                 Self::OverflowError(_) => 10700,
+                Self::ContestedUniqueIndexOnMutableDocumentTypeError(_) => 10701,
             }
         }
     }
@@ Expand Down @@