@dashevo/wasm-dpp 0.25.0-dev.1 → 0.25.0-dev.10

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/stateTransition/StateTransitionFacade.spec.js

@@ -137,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(),
       );

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);
     });
   });
 

package/test/unit/dataContract/stateTransition/DataContractCreateTransition/validation/state/validateDataContractCreateTransitionStateFactory.spec.js

@@ -1,5 +1,5 @@
-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');
 
@@ -27,8 +27,8 @@ describe('validateDataContractCreateTransitionStateFactory', () => {
     } = await loadWasmDpp());
   });
 
-  beforeEach(() => {
-    dataContract = getDataContractFixture();
+  beforeEach(async () => {
+    dataContract = await getDataContractFixture();
     stateTransition = new DataContractCreateTransition({
       protocolVersion: protocolVersion.latestVersion,
       dataContract: dataContract.toObject(),
@@ -54,10 +54,11 @@ describe('validateDataContractCreateTransitionStateFactory', () => {
     // This time our state repository should return a data contract on fetch
     const validator = new DataContractValidator();
     const dataContractFactory = new DataContractFactory(1, validator);
-    const wasmDataContract = await dataContractFactory.createFromBuffer(dataContract.toBuffer());
+    const reCreatedDataContract = await dataContractFactory
+      .createFromBuffer(dataContract.toBuffer());
 
     const stateRepositoryLikeWithContract = {
-      fetchDataContract: async () => wasmDataContract,
+      fetchDataContract: async () => reCreatedDataContract,
     };
 
     const result = await validateDataContractCreateTransitionState(

package/test/unit/dataContract/stateTransition/DataContractUpdateTransition/DataContractUpdateTransition.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');
 const protocolVersion = require('@dashevo/dpp/lib/version/protocolVersion');
@@ -62,11 +61,10 @@ describe('DataContractUpdateTransition', () => {
   });
 
   describe('#toBuffer', () => {
-    it('should return serialized State Transition that starts with protocol version', () => {
-      const protocolVersionBytes = Buffer.from(varint.encode(stateTransition.getProtocolVersion()));
-
+    it('should return serialized State Transition', () => {
       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(2239);
     });
   });
 

package/test/unit/dataContract/stateTransition/DataContractUpdateTransition/validation/state/validateDataContractUpdateTransitionStateFactory.spec.js

@@ -1,5 +1,5 @@
-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');
 
@@ -31,7 +31,7 @@ describe('validateDataContractUpdateTransitionStateFactory', () => {
   });
 
   beforeEach(async () => {
-    dataContract = getDataContractFixture();
+    dataContract = await getDataContractFixture();
 
     const updatedRawDataContract = dataContract.toObject();
 
@@ -46,10 +46,11 @@ describe('validateDataContractUpdateTransitionStateFactory', () => {
 
     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());
 
     const stateRepositoryLike = {
-      fetchDataContract: async () => wasmDataContract,
+      fetchDataContract: async () => reCreatedDataContract,
     };
 
     validateTransitionWithExistingContract = (t) => validateDataContractUpdateTransitionState(

package/test/unit/decodeProtocolEntityFactory.spec.js

@@ -4,7 +4,10 @@ const { encode } = require('@dashevo/dpp/lib/util/serializer');
 let { decodeProtocolEntity, ProtocolVersionParsingError, SerializedObjectParsingError } = require('../..');
 const { default: loadWasmDpp } = require('../..');
 
-describe('decodeProtocolEntityFactory', () => {
+// TODO: decodeProtocolEntity was broken after serialization refactoring
+//   it was mostly used in js-drive and does not seem to be needed anymore
+//   can we remove it completely?
+describe.skip('decodeProtocolEntityFactory', () => {
   let parsedProtocolVersion;
   let entityBuffer;
   let protocolVersionBuffer;

package/test/unit/document/Document.spec.js

@@ -411,15 +411,15 @@ describe('Document', () => {
   });
 
   describe('#toBuffer', () => {
-    it('returned bytes should be the same as JS version', () => {
-      const jsBuffer = documentJs.toBuffer();
+    it('should return serialized Document', () => {
       const buffer = document.toBuffer();
-
-      expect(jsBuffer.length).to.equal(buffer.length);
-      expect(jsBuffer).to.deep.equal(buffer);
+      expect(buffer).to.be.instanceOf(Buffer);
+      expect(buffer.length).to.equal(509);
     });
 
-    it('should return the same bytes as JS version when dynamic identifier is in Document', () => {
+    // TODO: remove or replace?
+    //  can not be compared to JS buffers anymore because uses bin code
+    it.skip('should return the same bytes as JS version when dynamic identifier is in Document', () => {
       const jsId = generateRandomIdentifier();
       const id = new Identifier(jsId.toBuffer());
       const path = 'dataObject.binaryObject.identifier';
@@ -438,7 +438,9 @@ describe('Document', () => {
       expect(jsBuffer).to.deep.equal(buffer);
     });
 
-    it('should return the same bytes as JS version when dynamic binaryData is in Document', () => {
+    // TODO: remove or replace?
+    //  can not be compared to JS buffers anymore because uses bin code
+    it.skip('should return the same bytes as JS version when dynamic binaryData is in Document', () => {
       const data = Buffer.alloc(32);
       const path = 'dataObject.binaryObject.binaryData';