@dashevo/wasm-dpp 0.24.0-dev.33 → 0.25.0-dev.10

package/src/validation/validation_result.rs

@@ -3,19 +3,19 @@ use crate::{
     errors::consensus::consensus_error::from_consensus_error_ref,
     utils::{consensus_errors_from_buffers, WithJsError},
 };
-use dpp::{consensus::ConsensusError, validation::ValidationResult};
+use dpp::{consensus::ConsensusError, validation::ConsensusValidationResult};
 use js_sys::{JsString, Uint8Array};
 use wasm_bindgen::prelude::*;
 
 #[wasm_bindgen(js_name=ValidationResult)]
 #[derive(Debug)]
-pub struct ValidationResultWasm(ValidationResult<JsValue>);
+pub struct ValidationResultWasm(ConsensusValidationResult<JsValue>);
 
-impl<T> From<ValidationResult<T>> for ValidationResultWasm
+impl<T> From<ConsensusValidationResult<T>> for ValidationResultWasm
 where
     T: Into<JsValue> + Clone,
 {
-    fn from(validation_result: ValidationResult<T>) -> Self {
+    fn from(validation_result: ConsensusValidationResult<T>) -> Self {
         ValidationResultWasm(validation_result.map(Into::into))
     }
 }
@@ -27,10 +27,12 @@ impl ValidationResultWasm {
         if let Some(errors) = errors_option {
             let consensus_errors: Vec<ConsensusError> = consensus_errors_from_buffers(errors)?;
 
-            return Ok(Self(ValidationResult::new_with_errors(consensus_errors)));
+            return Ok(Self(ConsensusValidationResult::new_with_errors(
+                consensus_errors,
+            )));
         }
 
-        Ok(Self(ValidationResult::new_with_errors(vec![])))
+        Ok(Self(ConsensusValidationResult::new_with_errors(vec![])))
     }
 
     /// This is just a test method - doesn't need to be in the resulted binding. Please
@@ -57,7 +59,10 @@ impl ValidationResultWasm {
 
     #[wasm_bindgen(js_name=getData)]
     pub fn get_data(&self) -> JsValue {
-        self.0.data().unwrap_or(&JsValue::undefined()).to_owned()
+        self.0
+            .data_as_borrowed()
+            .unwrap_or(&JsValue::undefined())
+            .to_owned()
     }
 
     #[wasm_bindgen(js_name=getFirstError)]

package/test/integration/dataContract/DataContractFacade.spec.js

@@ -1,5 +1,5 @@
-const getDataContractJSFixture = require('@dashevo/dpp/lib/test/fixtures/getDataContractFixture');
 const crypto = require('crypto');
+const getDataContractFixture = require('../../../lib/test/fixtures/getDataContractFixture');
 const getBlsAdapterMock = require('../../../lib/test/mocks/getBlsAdapterMock');
 const createStateRepositoryMock = require('../../../lib/test/mocks/createStateRepositoryMock');
 const getPrivateAndPublicKey = require('../../../lib/test/fixtures/getPrivateAndPublicKeyForSigningFixture');
@@ -12,11 +12,10 @@ let {
 
 describe('DataContractFacade', () => {
   let dpp;
-  let dataContractJs;
+  let dataContract;
   let dataContractFactory;
   let blsAdapter;
   let rawDataContract;
-  let dataContractWasm;
   let stateTransitionMock;
 
   before(async () => {
@@ -34,29 +33,27 @@ describe('DataContractFacade', () => {
       blsAdapter, stateTransitionMock, { generate: () => crypto.randomBytes(32) }, 1,
     );
 
-    dataContractJs = await getDataContractJSFixture();
-    rawDataContract = dataContractJs.toObject();
+    dataContract = await getDataContractFixture();
+    rawDataContract = dataContract.toObject();
 
     const dataContractValidator = new DataContractValidator();
     dataContractFactory = new DataContractFactory(
       1,
       dataContractValidator,
     );
-
-    dataContractWasm = await dataContractFactory.createFromObject(rawDataContract);
   });
 
   describe('create', () => {
     it('should create DataContract', () => {
       const result = dpp.dataContract.create(
-        dataContractJs.getOwnerId(),
-        dataContractJs.getDocuments(),
+        dataContract.getOwnerId(),
+        dataContract.getDocuments(),
       );
 
       expect(result).to.be.an.instanceOf(DataContract);
 
-      expect(result.getOwnerId().toBuffer()).to.deep.equal(dataContractJs.getOwnerId().toBuffer());
-      expect(result.getDocuments()).to.deep.equal(dataContractJs.getDocuments());
+      expect(result.getOwnerId().toBuffer()).to.deep.equal(dataContract.getOwnerId().toBuffer());
+      expect(result.getDocuments()).to.deep.equal(dataContract.getDocuments());
     });
   });
 
@@ -66,15 +63,15 @@ describe('DataContractFacade', () => {
 
       expect(result).to.be.an.instanceOf(DataContract);
 
-      expect(result.toObject()).to.deep.equal(dataContractJs.toObject());
+      expect(result.toObject()).to.deep.equal(dataContract.toObject());
     });
   });
 
   describe('createFromBuffer', () => {
     it('should create DataContract from string', async () => {
       const contract = dpp.dataContract.create(
-        dataContractJs.getOwnerId(),
-        dataContractJs.getDocuments(),
+        dataContract.getOwnerId(),
+        dataContract.getDocuments(),
       );
 
       const result = await dpp.dataContract.createFromBuffer(contract.toBuffer());
@@ -87,9 +84,9 @@ describe('DataContractFacade', () => {
   describe('createDataContractCreateTransition', () => {
     it('should create DataContractCreateTransition from DataContract', async () => {
       const stateTransition = await dataContractFactory
-        .createDataContractCreateTransition(dataContractWasm);
+        .createDataContractCreateTransition(dataContract);
 
-      const result = dpp.dataContract.createDataContractCreateTransition(dataContractWasm);
+      const result = dpp.dataContract.createDataContractCreateTransition(dataContract);
 
       expect(result).to.be.an.instanceOf(DataContractCreateTransition);
 
@@ -99,12 +96,12 @@ describe('DataContractFacade', () => {
 
   describe('createDataContractUpdateTransition', () => {
     it('should create DataContractUpdateTransition from buffer', async () => {
-      const dataContractBuffer = Buffer.from('01a56324696458205a3c9565f215156cfb330ef3a4a4400a1dad7415f4f1480e072d3419bb29c12c6724736368656d61783468747470733a2f2f736368656d612e646173682e6f72672f6470702d302d342d302f6d6574612f646174612d636f6e7472616374676f776e657249645820d5199a5b19334554d5dd483af53877251584ab9a66ca777bd1b2e8d2ec4808346776657273696f6e0169646f63756d656e7473a36c6e696365446f63756d656e74a46474797065666f626a656374687265717569726564816a246372656174656441746a70726f70657274696573a1646e616d65a1647479706566737472696e67746164646974696f6e616c50726f70657274696573f46e7769746842797465417272617973a56474797065666f626a65637467696e646963657381a2646e616d6566696e646578316a70726f7065727469657381a16e6279746541727261794669656c6463617363687265717569726564816e6279746541727261794669656c646a70726f70657274696573a26e6279746541727261794669656c64a36474797065656172726179686d61784974656d731069627974654172726179f56f6964656e7469666965724669656c64a56474797065656172726179686d61784974656d731820686d696e4974656d73182069627974654172726179f570636f6e74656e744d656469615479706578216170706c69636174696f6e2f782e646173682e6470702e6964656e746966696572746164646974696f6e616c50726f70657274696573f46f696e6465786564446f63756d656e74a56474797065666f626a65637467696e646963657386a3646e616d6566696e646578316a70726f7065727469657382a168246f776e6572496463617363a16966697273744e616d656361736366756e69717565f5a3646e616d6566696e646578326a70726f7065727469657382a168246f776e6572496463617363a1686c6173744e616d656361736366756e69717565f5a2646e616d6566696e646578336a70726f7065727469657381a1686c6173744e616d6563617363a2646e616d6566696e646578346a70726f7065727469657382a16a2463726561746564417463617363a16a2475706461746564417463617363a2646e616d6566696e646578356a70726f7065727469657381a16a2475706461746564417463617363a2646e616d6566696e646578366a70726f7065727469657381a16a2463726561746564417463617363687265717569726564846966697273744e616d656a246372656174656441746a24757064617465644174686c6173744e616d656a70726f70657274696573a2686c6173744e616d65a2647479706566737472696e67696d61784c656e677468183f6966697273744e616d65a2647479706566737472696e67696d61784c656e677468183f746164646974696f6e616c50726f70657274696573f4', 'hex');
+      const dataContractBuffer = dataContract.toBuffer();
 
-      const dataContract = await dpp.dataContract.createFromBuffer(dataContractBuffer);
+      const dataContractNew = await dpp.dataContract.createFromBuffer(dataContractBuffer);
 
       const updatedDataContract = await dpp.dataContract.createFromObject(
-        dataContract.toObject(),
+        dataContractNew.toObject(),
       );
 
       updatedDataContract.incrementVersion();
@@ -138,7 +135,7 @@ describe('DataContractFacade', () => {
     });
 
     it('should validate DataContract instance', async () => {
-      const result = await dpp.dataContract.validate(dataContractWasm);
+      const result = await dpp.dataContract.validate(dataContract);
 
       expect(result).to.be.an.instanceOf(ValidationResult);
       expect(result.getErrors().length).to.be.equal(0);

package/test/integration/dataContract/stateTransition/DataContractUpdateTransition/validation/basic/validateDataContractUpdateTransitionBasicFactory.spec.js

@@ -1,6 +1,6 @@
 const protocolVersion = require('@dashevo/dpp/lib/version/protocolVersion');
 const createStateRepositoryMock = require('@dashevo/dpp/lib/test/mocks/createStateRepositoryMock');
-const getDataContractFixture = require('@dashevo/dpp/lib/test/fixtures/getDataContractFixture');
+const getDataContractFixture = require('../../../../../../../lib/test/fixtures/getDataContractFixture');
 const { expectJsonSchemaError, expectValidationError, expectValueError } = require('../../../../../../../lib/test/expect/expectError');
 
 const { default: loadWasmDpp } = require('../../../../../../../dist');
@@ -39,7 +39,7 @@ describe('validateDataContractUpdateTransitionBasicFactory', () => {
   });
 
   beforeEach(async function beforeEach() {
-    dataContract = getDataContractFixture();
+    dataContract = await getDataContractFixture();
 
     rawDataContract = dataContract.toObject();
     rawDataContract.version += 1;
@@ -55,9 +55,10 @@ describe('validateDataContractUpdateTransitionBasicFactory', () => {
 
     const validator = new DataContractValidator();
     const dataContractFactory = new DataContractFactory(protocolVersion.latestVersion, validator);
-    const wasmDataContract = await dataContractFactory.createFromBuffer(dataContract.toBuffer());
+    const reCreatedDataContract = await dataContractFactory
+      .createFromBuffer(dataContract.toBuffer());
     stateRepositoryMock = createStateRepositoryMock(this.sinonSandbox);
-    stateRepositoryMock.fetchDataContract.resolves(wasmDataContract);
+    stateRepositoryMock.fetchDataContract.resolves(reCreatedDataContract);
 
     executionContext = new StateTransitionExecutionContext();
 

package/test/integration/dataContract/validation/validateDataContractFactory.spec.js

@@ -17,7 +17,6 @@ describe('validateDataContractFactory', () => {
   let UniqueIndicesLimitReachedError;
   let SystemPropertyIndexAlreadyPresentError;
   let InvalidIndexPropertyTypeError;
-  let InvalidCompoundIndexError;
   let InvalidIndexedPropertyConstraintError;
   let InvalidJsonSchemaRefError;
 
@@ -32,7 +31,6 @@ describe('validateDataContractFactory', () => {
       UniqueIndicesLimitReachedError,
       SystemPropertyIndexAlreadyPresentError,
       InvalidIndexPropertyTypeError,
-      InvalidCompoundIndexError,
       InvalidIndexedPropertyConstraintError,
       InvalidJsonSchemaRefError,
     } = await loadWasmDpp());
@@ -1929,21 +1927,6 @@ describe('validateDataContractFactory', () => {
         expect(error.getDocumentType()).to.deep.equal('indexedDocument');
         expect(error.getIndexName()).to.equal('index1');
       });
-
-      it('should return invalid result if unique compound index contains both required and optional properties', async () => {
-        const rawDataContract = dataContract.toObject();
-        rawDataContract.documents.optionalUniqueIndexedDocument.required.splice(-1);
-
-        const result = await validateDataContract(rawDataContract);
-
-        expectValidationError(result, InvalidCompoundIndexError);
-
-        const [error] = result.getErrors();
-
-        expect(error.getCode()).to.equal(1010);
-        expect(error.getIndexName()).to.equal('index2');
-        expect(error.getDocumentType()).to.equal('optionalUniqueIndexedDocument');
-      });
     });
   });
 

package/test/integration/document/stateTransition/DocumentsBatchTransition/DocumentBatchTransition.spec.js

@@ -78,7 +78,11 @@ describe('DocumentBatchTransition', () => {
 
       // Nice document has medium security level
       expect(stateTransitionFixture.getKeySecurityLevelRequirement())
-        .to.be.equal(IdentityPublicKey.SECURITY_LEVELS.MEDIUM);
+        .to.deep.equal([
+          IdentityPublicKey.SECURITY_LEVELS.CRITICAL,
+          IdentityPublicKey.SECURITY_LEVELS.HIGH,
+          IdentityPublicKey.SECURITY_LEVELS.MEDIUM,
+        ]);
 
       stateTransitionFixture = documentFactory.createStateTransition({
         create: [mediumSecurityDocumentFixture, masterSecurityDocumentFixture],
@@ -88,7 +92,7 @@ describe('DocumentBatchTransition', () => {
 
       // Should be the highest security level out of MEDIUM and MASTER
       expect(stateTransitionFixture.getKeySecurityLevelRequirement())
-        .to.be.equal(IdentityPublicKey.SECURITY_LEVELS.MASTER);
+        .to.deep.equal([IdentityPublicKey.SECURITY_LEVELS.MASTER]);
     });
 
     it('should return default security level if no document has a security level defined - Rust', () => {
@@ -100,7 +104,10 @@ describe('DocumentBatchTransition', () => {
 
       // Should be the default level, which is HIGH
       expect(stateTransitionFixture.getKeySecurityLevelRequirement())
-        .to.be.equal(IdentityPublicKey.SECURITY_LEVELS.HIGH);
+        .to.deep.equal([
+          IdentityPublicKey.SECURITY_LEVELS.CRITICAL,
+          IdentityPublicKey.SECURITY_LEVELS.HIGH,
+        ]);
     });
   });
 });

package/test/integration/identity/stateTransition/IdentityUpdateTransition/validation/state/validateIdentityUpdateTransitionStateFactory.spec.js

@@ -63,8 +63,9 @@ describe('validateIdentityUpdateTransitionStateFactory', () => {
     stateRepositoryMock.fetchLatestPlatformBlockTime = this.sinonSandbox.stub();
     stateRepositoryMock.fetchLatestPlatformBlockTime.resolves(blockTime);
 
+    executionContext = new StateTransitionExecutionContext();
     const validator = new IdentityUpdateTransitionStateValidator(stateRepositoryMock, blsAdapter);
-    validateIdentityUpdateTransitionState = (st) => validator.validate(st);
+    validateIdentityUpdateTransitionState = (st) => validator.validate(st, executionContext);
 
     stateTransition = await getIdentityUpdateTransitionFixture();
 
@@ -72,10 +73,6 @@ describe('validateIdentityUpdateTransitionStateFactory', () => {
     stateTransition.setPublicKeyIdsToDisable(undefined);
     stateTransition.setPublicKeysDisabledAt(undefined);
 
-    executionContext = new StateTransitionExecutionContext();
-
-    stateTransition.setExecutionContext(executionContext);
-
     const privateKey = '9b67f852093bc61cea0eeca38599dbfba0de28574d2ed9b99d10d33dc1bde7b2';
 
     await stateTransition.signByPrivateKey(
@@ -275,10 +272,10 @@ describe('validateIdentityUpdateTransitionStateFactory', () => {
     // Make code that executes after dry run check to fail
     stateRepositoryMock.fetchLatestPlatformBlockTime.resolves({});
 
-    stateTransition.getExecutionContext().enableDryRun();
+    executionContext.enableDryRun();
     const result = await validateIdentityUpdateTransitionState(stateTransition);
 
-    stateTransition.getExecutionContext().disableDryRun();
+    executionContext.disableDryRun();
 
     expect(result.isValid()).to.be.true();
 

package/test/integration/stateTransition/StateTransitionFacade.spec.js

@@ -21,6 +21,7 @@ describe('StateTransitionFacade', () => {
   let dataContract;
   let identityPublicKey;
   let identity;
+  let executionContext;
 
   let DashPlatformProtocol;
   let DataContractFactory;
@@ -37,6 +38,7 @@ describe('StateTransitionFacade', () => {
   let InvalidStateTransitionSignatureError;
   let DataContractAlreadyPresentError;
   let BalanceIsNotEnoughError;
+  let StateTransitionExecutionContext;
 
   before(async () => {
     ({
@@ -55,6 +57,7 @@ describe('StateTransitionFacade', () => {
       InvalidStateTransitionSignatureError,
       DataContractAlreadyPresentError,
       BalanceIsNotEnoughError,
+      StateTransitionExecutionContext,
     } = await loadWasmDpp());
   });
 
@@ -64,6 +67,8 @@ describe('StateTransitionFacade', () => {
     const publicKey = privateKeyModel.toPublicKey().toBuffer();
     const publicKeyId = 1;
 
+    executionContext = new StateTransitionExecutionContext();
+
     identityPublicKey = new IdentityPublicKey({
       id: publicKeyId,
       type: IdentityPublicKey.TYPES.ECDSA_SECP256K1,
@@ -132,7 +137,7 @@ describe('StateTransitionFacade', () => {
   });
 
   describe('createFromBuffer', () => {
-    it('should create State Transition from string', async () => {
+    it('should create Data Contract State Transition from buffer', async () => {
       const result = await dpp.stateTransition.createFromBuffer(
         dataContractCreateTransition.toBuffer(),
       );
@@ -148,7 +153,7 @@ describe('StateTransitionFacade', () => {
       const rawStateTransition = dataContractCreateTransition.toObject();
       rawStateTransition.protocolVersion = 100;
 
-      const result = await dpp.stateTransition.validate(rawStateTransition);
+      const result = await dpp.stateTransition.validate(rawStateTransition, executionContext);
 
       expect(result).to.be.an.instanceOf(ValidationResult);
       expect(result.isValid()).to.be.false();
@@ -161,7 +166,7 @@ describe('StateTransitionFacade', () => {
       const rawStateTransition = dataContractCreateTransition.toObject();
       rawStateTransition.signature = Buffer.alloc(65).fill(1);
 
-      const result = await dpp.stateTransition.validate(rawStateTransition);
+      const result = await dpp.stateTransition.validate(rawStateTransition, executionContext);
 
       expect(result).to.be.an.instanceOf(ValidationResult);
       expect(result.isValid()).to.be.false();
@@ -173,7 +178,9 @@ describe('StateTransitionFacade', () => {
     it('should return invalid result if not enough balance to pay fee for State Transition', async () => {
       identity.setBalance(0);
       stateRepositoryMock.fetchIdentityBalance.resolves(0);
-      const result = await dpp.stateTransition.validate(dataContractCreateTransition);
+      const result = await dpp.stateTransition.validate(
+        dataContractCreateTransition, executionContext,
+      );
 
       expect(result).to.be.an.instanceOf(ValidationResult);
       expect(result.isValid()).to.be.false();
@@ -185,7 +192,9 @@ describe('StateTransitionFacade', () => {
     it('should return invalid result if State Transition is invalid against state', async () => {
       stateRepositoryMock.fetchDataContract.resolves(dataContract);
 
-      const result = await dpp.stateTransition.validate(dataContractCreateTransition);
+      const result = await dpp.stateTransition.validate(
+        dataContractCreateTransition, executionContext,
+      );
 
       expect(result).to.be.an.instanceOf(ValidationResult);
       expect(result.isValid()).to.be.false();
@@ -197,6 +206,7 @@ describe('StateTransitionFacade', () => {
     it('should validate DataContractCreateTransition', async () => {
       const result = await dpp.stateTransition.validate(
         dataContractCreateTransition,
+        executionContext,
       );
 
       expect(result).to.be.an.instanceOf(ValidationResult);
@@ -210,6 +220,7 @@ describe('StateTransitionFacade', () => {
       stateRepositoryMock.fetchDataContract.resolves(dataContract);
       const result = await dpp.stateTransition.validate(
         documentsBatchTransition,
+        executionContext,
       );
 
       expect(result).to.be.an.instanceOf(ValidationResult);
@@ -220,7 +231,7 @@ describe('StateTransitionFacade', () => {
   describe('validateBasic', () => {
     it('should validate State Transition', async () => {
       const result = await dpp.stateTransition.validateBasic(
-        dataContractCreateTransition.toObject(),
+        dataContractCreateTransition.toObject(), executionContext,
       );
 
       expect(result).to.be.an.instanceOf(ValidationResult);
@@ -231,7 +242,7 @@ describe('StateTransitionFacade', () => {
   describe('validateSignature', () => {
     it('should validate identity signed State Transition', async () => {
       const result = await dpp.stateTransition.validateSignature(
-        dataContractCreateTransition,
+        dataContractCreateTransition, executionContext,
       );
 
       expect(result).to.be.an.instanceOf(ValidationResult);
@@ -254,7 +265,7 @@ describe('StateTransitionFacade', () => {
       );
 
       const result = await dpp.stateTransition.validateSignature(
-        identityCreateTransition,
+        identityCreateTransition, executionContext,
       );
 
       expect(result).to.be.an.instanceOf(ValidationResult);
@@ -266,6 +277,7 @@ describe('StateTransitionFacade', () => {
     it('should validate State Transition', async () => {
       const result = await dpp.stateTransition.validateFee(
         dataContractCreateTransition,
+        executionContext,
       );
 
       expect(result).to.be.an.instanceOf(ValidationResult);
@@ -277,6 +289,7 @@ describe('StateTransitionFacade', () => {
     it('should validate State Transition', async () => {
       const result = await dpp.stateTransition.validateState(
         dataContractCreateTransition,
+        executionContext,
       );
 
       expect(result).to.be.an.instanceOf(ValidationResult);

package/test/unit/dataContract/DataContract.spec.js

@@ -1,7 +1,6 @@
 const bs58 = require('bs58');
 
 const generateRandomIdentifier = require('@dashevo/dpp/lib/test/utils/generateRandomIdentifier');
-const JsDataContract = require('@dashevo/dpp/lib/dataContract/DataContract');
 
 const { default: loadWasmDpp } = require('../../../dist');
 
@@ -9,7 +8,6 @@ describe('DataContract', () => {
   let documentType;
   let documentSchema;
   let documents;
-  let jsDataContract;
   let ownerId;
   let entropy;
   let contractId;
@@ -52,16 +50,6 @@ describe('DataContract', () => {
 
     defs = { something: { type: 'string' } };
 
-    jsDataContract = new JsDataContract({
-      $schema: JsDataContract.DEFAULTS.SCHEMA,
-      $id: contractId,
-      version: 1,
-      protocolVersion: 1,
-      ownerId,
-      documents,
-      $defs: defs,
-    });
-
     dataContract = new DataContract({
       $schema: DataContractDefaults.SCHEMA,
       $id: contractId,
@@ -285,21 +273,21 @@ describe('DataContract', () => {
 
   describe('#toBuffer', () => {
     it('should return DataContract as a Buffer', () => {
-      expect(jsDataContract.getProtocolVersion()).to.deep.equal(dataContract.getProtocolVersion());
-
-      const jsResult = jsDataContract.toBuffer();
-      const wasmResult = dataContract.toBuffer();
-
-      expect(wasmResult).to.deep.equal(jsResult);
+      const result = dataContract.toBuffer();
+      expect(result).to.be.instanceOf(Buffer);
+      expect(result).to.have.lengthOf(251);
     });
   });
 
+  // TODO: can not compare to JS because rust
+  //  DataContract does not match JS anymore
   describe('#hash', () => {
     it('should return DataContract hash', () => {
-      const jsResult = jsDataContract.hash();
+      // const jsResult = jsDataContract.hash();
       const wasmResult = dataContract.hash();
-
-      expect(wasmResult).to.deep.equal(jsResult);
+      //
+      // expect(wasmResult).to.deep.equal(jsResult);
+      expect(wasmResult).to.be.instanceOf(Uint8Array);
     });
   });
 

package/test/unit/dataContract/DataContractFactory.spec.js

@@ -1,19 +1,17 @@
-const getDataContractFixture = require('@dashevo/dpp/lib/test/fixtures/getDataContractFixture');
-
 const protocolVersion = require('@dashevo/dpp/lib/version/protocolVersion');
+const getDataContractFixture = require('../../../lib/test/fixtures/getDataContractFixture');
 
-const { default: loadWasmDpp } = require('../../../dist');
+const { default: loadWasmDpp, UnsupportedProtocolVersionError } = require('../../../dist');
 
 describe('DataContractFactory', () => {
   let DataContractFactory;
   let DataContractValidator;
   let DataContract;
   let InvalidDataContractError;
-  let SerializedObjectParsingError;
   let JsonSchemaError;
 
   let factory;
-  let jsDataContract;
+  let dataContract;
   let rawDataContract;
   let dataContractValidator;
 
@@ -23,18 +21,13 @@ describe('DataContractFactory', () => {
       DataContractValidator,
       DataContract,
       InvalidDataContractError,
-      SerializedObjectParsingError,
       JsonSchemaError,
     } = await loadWasmDpp());
   });
 
-  beforeEach(() => {
-    jsDataContract = getDataContractFixture();
-
-    // For some reason fixture has empty $defs which violates meta schema
-    delete jsDataContract.$defs;
-
-    rawDataContract = jsDataContract.toObject();
+  beforeEach(async () => {
+    dataContract = await getDataContractFixture();
+    rawDataContract = dataContract.toObject();
 
     dataContractValidator = new DataContractValidator();
 
@@ -47,7 +40,7 @@ describe('DataContractFactory', () => {
   describe('create', () => {
     it('should return new Data Contract with specified name and documents definition', () => {
       const result = factory.create(
-        jsDataContract.ownerId.toBuffer(),
+        dataContract.getOwnerId(),
         rawDataContract.documents,
       ).toObject();
 
@@ -62,8 +55,7 @@ describe('DataContractFactory', () => {
     });
 
     it('should return new Data Contract without validation if "skipValidation" option is passed', async () => {
-      const alteredContract = jsDataContract.toObject();
-      alteredContract.$defs = {}; // Empty defs are bad!
+      const alteredContract = dataContract.toObject();
 
       const resultSkipValidation = await factory.createFromObject(alteredContract, true);
 
@@ -71,8 +63,7 @@ describe('DataContractFactory', () => {
     });
 
     it('should throw an error if passed object is not valid', async () => {
-      const alteredContract = jsDataContract.toObject();
-      alteredContract.$defs = {}; // Empty defs are bad!
+      const alteredContract = dataContract.toObject();
 
       try {
         await factory.createFromObject(alteredContract);
@@ -91,24 +82,24 @@ describe('DataContractFactory', () => {
     let serializedDataContract;
 
     beforeEach(() => {
-      serializedDataContract = jsDataContract.toBuffer();
+      serializedDataContract = dataContract.toBuffer();
     });
 
     it('should return new Data Contract from serialized contract', async () => {
       const result = await factory.createFromBuffer(serializedDataContract);
 
-      expect(result.toObject()).to.deep.equal(jsDataContract.toObject());
+      expect(result.toObject()).to.deep.equal(dataContract.toObject());
     });
 
     it('should throw InvalidDataContractError if the decoding fails with consensus error', async () => {
       try {
         // Casually break serialized data contract:
-        serializedDataContract[5] += 1337;
+        serializedDataContract[0] = 3;
         await factory.createFromBuffer(serializedDataContract);
         expect.fail('should throw InvalidDataContractError');
       } catch (e) {
-        expect(e).to.be.an.instanceOf(SerializedObjectParsingError);
-        expect(e.getParsingError()).to.equals('Syntax(1)');
+        expect(e).to.be.an.instanceOf(InvalidDataContractError);
+        expect(e.getErrors()[0]).to.be.an.instanceOf(UnsupportedProtocolVersionError);
       }
     });
   });
@@ -116,14 +107,14 @@ describe('DataContractFactory', () => {
   describe('createDataContractCreateTransition', () => {
     it('should return new DataContractCreateTransition with passed DataContract', async () => {
       // Create wasm version of DataContract
-      const dataContract = new DataContract(rawDataContract);
-      dataContract.setEntropy(jsDataContract.getEntropy());
+      const newDataContract = new DataContract(rawDataContract);
+      newDataContract.setEntropy(dataContract.getEntropy());
 
-      const result = await factory.createDataContractCreateTransition(dataContract);
+      const result = await factory.createDataContractCreateTransition(newDataContract);
 
       expect(result.getProtocolVersion()).to.equal(protocolVersion.latestVersion);
-      expect(result.getEntropy()).to.deep.equal(jsDataContract.getEntropy());
-      expect(result.getDataContract().toObject()).to.deep.equal(jsDataContract.toObject());
+      expect(result.getEntropy()).to.deep.equal(dataContract.getEntropy());
+      expect(result.getDataContract().toObject()).to.deep.equal(dataContract.toObject());
     });
   });
 });

package/test/unit/dataContract/stateTransition/DataContractCreateTransition/DataContractCreateTransition.spec.js

@@ -1,4 +1,3 @@
-const varint = require('varint');
 const getDataContractFixture = require('@dashevo/dpp/lib/test/fixtures/getDataContractFixture');
 const stateTransitionTypes = require('@dashevo/dpp/lib/stateTransition/stateTransitionTypes');
 
@@ -65,10 +64,9 @@ describe('DataContractCreateTransition', () => {
 
   describe('#toBuffer', () => {
     it('should return serialized State Transition', () => {
-      const protocolVersionBytes = Buffer.from(varint.encode(stateTransition.getProtocolVersion()));
-
       const result = stateTransition.toBuffer();
-      expect(result.compare(protocolVersionBytes, 0, 1, 0, 1)).equals(0);
+      expect(result).to.be.instanceOf(Buffer);
+      expect(result).to.have.lengthOf(2271);
     });
   });