Skip to content

issue #76: Fixed MosaicInfoDTO fields with new cow DTO content #81

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 11, 2019
Merged

issue #76: Fixed MosaicInfoDTO fields with new cow DTO content #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f19c80c
issue #76: Fixed MosaicInfoDTO fields with new cow DTO content
evias Mar 11, 2019
37a874d
v0.10.3-5: Fixed #76 issue with MosaicInfo DTOs
evias Mar 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nem2-sdk",
"version": "0.10.3-4",
"version": "0.10.3-5",
"description": "Reactive Nem2 sdk for typescript and javascript",
"scripts": {
"pretest": "npm run build",
Expand Down
8 changes: 2 additions & 6 deletions src/infrastructure/MosaicHttp.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,12 @@ export class MosaicHttp extends Http implements MosaicRepository {
mergeMap((networkType) => observableFrom(
this.mosaicRoutesApi.getMosaic(mosaicId.toHex())).pipe(map((mosaicInfoDTO) => {
return new MosaicInfo(
mosaicInfoDTO.meta.active,
mosaicInfoDTO.meta.index,
mosaicInfoDTO.meta.id,
new MosaicId(mosaicInfoDTO.mosaic.mosaicId),
new UInt64(mosaicInfoDTO.mosaic.nonce),
new UInt64(mosaicInfoDTO.mosaic.supply),
new UInt64(mosaicInfoDTO.mosaic.height),
PublicAccount.createFromPublicKey(mosaicInfoDTO.mosaic.owner, networkType),
mosaicInfoDTO.mosaic.revision,
new MosaicProperties(
new UInt64(mosaicInfoDTO.mosaic.properties[0]),
(new UInt64(mosaicInfoDTO.mosaic.properties[1])).compact(),
Expand All @@ -93,14 +91,12 @@ export class MosaicHttp extends Http implements MosaicRepository {
this.mosaicRoutesApi.getMosaics(mosaicIdsBody)).pipe(map((mosaicInfosDTO) => {
return mosaicInfosDTO.map((mosaicInfoDTO) => {
return new MosaicInfo(
mosaicInfoDTO.meta.active,
mosaicInfoDTO.meta.index,
mosaicInfoDTO.meta.id,
new MosaicId(mosaicInfoDTO.mosaic.mosaicId),
new UInt64(mosaicInfoDTO.mosaic.nonce),
new UInt64(mosaicInfoDTO.mosaic.supply),
new UInt64(mosaicInfoDTO.mosaic.height),
PublicAccount.createFromPublicKey(mosaicInfoDTO.mosaic.owner, networkType),
mosaicInfoDTO.mosaic.revision,
new MosaicProperties(
new UInt64(mosaicInfoDTO.mosaic.properties[0]),
(new UInt64(mosaicInfoDTO.mosaic.properties[1])).compact(),
Expand Down
16 changes: 4 additions & 12 deletions src/model/mosaic/MosaicInfo.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,25 +36,13 @@ export class MosaicInfo {
* @param levy
*/
constructor(/**
* Mosaic is active.
*/
public readonly active: boolean,
/**
* The mosaic index.
*/
public readonly index: number,
/**
* The meta data id.
*/
public readonly metaId: string,
/**
* The mosaic id.
*/
public readonly mosaicId: MosaicId,
/**
* The mosaic nonce.
*/
public readonly nonce: UInt64,
/**
* The mosaic supply.
*/
Expand All @@ -67,6 +55,10 @@ export class MosaicInfo {
* The public key of the mosaic creator.
*/
public readonly owner: PublicAccount,
/**
* The mosaic revision
*/
public readonly revision: number,
/**
* The mosaic properties.
*/
Expand Down
11 changes: 8 additions & 3 deletions test/model/mosaic/MosaicAmountView.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,21 @@ describe('MosaicAmountView', () => {
let mosaicInfo: MosaicInfo;

before(() => {
mosaicInfo = new MosaicInfo(true, 0, '59FDA0733F17CF0001772CBC', new MosaicId([3294802500, 2243684972]),
new UInt64([1, 0]), new UInt64([3403414400, 2095475]), new UInt64([1, 0]),
mosaicInfo = new MosaicInfo(
'59FDA0733F17CF0001772CBC',
new MosaicId([3294802500, 2243684972]), // mosaicId
new UInt64([3403414400, 2095475]), // supply
new UInt64([1, 0]), // height
PublicAccount.createFromPublicKey('B4F12E7C9F6946091E2CB8B6D3A12B50D17CCBBF646386EA27CE2946A7423DCF', NetworkType.MIJIN_TEST),
1, // revision
MosaicProperties.create({
supplyMutable: true,
transferable: true,
levyMutable: true,
divisibility: 3,
duration: UInt64.fromUint(1000),
}), {});
}),
{});
});

it('should createComplete a Mosaic Amount View', () => {
Expand Down
60 changes: 17 additions & 43 deletions test/model/mosaic/MosaicInfo.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,32 +27,22 @@ import {NamespaceId} from '../../../src/model/namespace/NamespaceId';
describe('MosaicInfo', () => {
const mosaicInfoDTO = {
meta: {
active: true,
id: '59FDA0733F17CF0001772CBC',
index: 0,
},
mosaic: {
height: new UInt64([1, 0]),
levy: {},
mosaicId: new MosaicId([3646934825, 3576016193]),
nonce: new UInt64([1, 0]),
owner: PublicAccount.createFromPublicKey('B4F12E7C9F6946091E2CB8B6D3A12B50D17CCBBF646386EA27CE2946A7423DCF',
supply: new UInt64([3403414400, 2095475]),
height: new UInt64([1, 0]),
owner: PublicAccount.createFromPublicKey(
'B4F12E7C9F6946091E2CB8B6D3A12B50D17CCBBF646386EA27CE2946A7423DCF',
NetworkType.MIJIN_TEST),
revision: 1,
properties: [
new UInt64([
6,
0,
]),
new UInt64([
3,
0,
]),
new UInt64([
1000,
0,
]),
new UInt64([6, 0]), // divisibility
new UInt64([3, 0]), // flags
new UInt64([1000, 0]), // duration
],
supply: new UInt64([3403414400, 2095475]),
levy: {},
},
};

Expand All @@ -62,14 +52,12 @@ describe('MosaicInfo', () => {

it('should createComplete an MosaicInfo object', () => {
const mosaicInfo = new MosaicInfo(
mosaicInfoDTO.meta.active,
mosaicInfoDTO.meta.index,
mosaicInfoDTO.meta.id,
mosaicInfoDTO.mosaic.mosaicId,
mosaicInfoDTO.mosaic.nonce,
mosaicInfoDTO.mosaic.supply,
mosaicInfoDTO.mosaic.height,
mosaicInfoDTO.mosaic.owner,
mosaicInfoDTO.mosaic.revision,
new MosaicProperties(
mosaicInfoDTO.mosaic.properties[0],
mosaicInfoDTO.mosaic.properties[1].compact(),
Expand All @@ -78,14 +66,12 @@ describe('MosaicInfo', () => {
mosaicInfoDTO.mosaic.levy,
);

expect(mosaicInfo.active).to.be.equal(mosaicInfoDTO.meta.active);
expect(mosaicInfo.index).to.be.equal(mosaicInfoDTO.meta.index);
expect(mosaicInfo.metaId).to.be.equal(mosaicInfoDTO.meta.id);
deepEqual(mosaicInfo.mosaicId, mosaicInfoDTO.mosaic.mosaicId);
deepEqual(mosaicInfo.nonce, mosaicInfoDTO.mosaic.nonce);
deepEqual(mosaicInfo.supply, mosaicInfoDTO.mosaic.supply);
deepEqual(mosaicInfo.height, mosaicInfoDTO.mosaic.height);
expect(mosaicInfo.owner).to.be.equal(mosaicInfoDTO.mosaic.owner);
deepEqual(mosaicInfo.revision, mosaicInfoDTO.mosaic.revision);

expect(mosaicInfo.divisibility).to.be.equal(mosaicInfoDTO.mosaic.properties[1].lower);
deepEqual(mosaicInfo.duration, mosaicInfoDTO.mosaic.properties[2]);
Expand All @@ -95,14 +81,12 @@ describe('MosaicInfo', () => {
describe('isSupplyMutable', () => {
it('should return true when it\'s mutable', () => {
const mosaicInfo = new MosaicInfo(
mosaicInfoDTO.meta.active,
mosaicInfoDTO.meta.index,
mosaicInfoDTO.meta.id,
mosaicInfoDTO.mosaic.mosaicId,
mosaicInfoDTO.mosaic.nonce,
mosaicInfoDTO.mosaic.supply,
mosaicInfoDTO.mosaic.height,
mosaicInfoDTO.mosaic.owner,
mosaicInfoDTO.mosaic.revision,
MosaicProperties.create({
supplyMutable: true,
transferable: false,
Expand All @@ -118,14 +102,12 @@ describe('MosaicInfo', () => {

it('should return false when it\'s immutable', () => {
const mosaicInfo = new MosaicInfo(
mosaicInfoDTO.meta.active,
mosaicInfoDTO.meta.index,
mosaicInfoDTO.meta.id,
mosaicInfoDTO.mosaic.mosaicId,
mosaicInfoDTO.mosaic.nonce,
mosaicInfoDTO.mosaic.supply,
mosaicInfoDTO.mosaic.height,
mosaicInfoDTO.mosaic.owner,
mosaicInfoDTO.mosaic.revision,
MosaicProperties.create({
supplyMutable: false,
transferable: false,
Expand All @@ -142,14 +124,12 @@ describe('MosaicInfo', () => {
describe('isTransferable', () => {
it('should return true when it\'s transferable', () => {
const mosaicInfo = new MosaicInfo(
mosaicInfoDTO.meta.active,
mosaicInfoDTO.meta.index,
mosaicInfoDTO.meta.id,
mosaicInfoDTO.mosaic.mosaicId,
mosaicInfoDTO.mosaic.nonce,
mosaicInfoDTO.mosaic.supply,
mosaicInfoDTO.mosaic.height,
mosaicInfoDTO.mosaic.owner,
mosaicInfoDTO.mosaic.revision,
MosaicProperties.create({
supplyMutable: false,
transferable: true,
Expand All @@ -164,14 +144,12 @@ describe('MosaicInfo', () => {

it('should return false when it\'s not transferable', () => {
const mosaicInfo = new MosaicInfo(
mosaicInfoDTO.meta.active,
mosaicInfoDTO.meta.index,
mosaicInfoDTO.meta.id,
mosaicInfoDTO.mosaic.mosaicId,
mosaicInfoDTO.mosaic.nonce,
mosaicInfoDTO.mosaic.supply,
mosaicInfoDTO.mosaic.height,
mosaicInfoDTO.mosaic.owner,
mosaicInfoDTO.mosaic.revision,
MosaicProperties.create({
supplyMutable: false,
transferable: false,
Expand All @@ -188,14 +166,12 @@ describe('MosaicInfo', () => {
describe('isLevyMutable', () => {
it('should return true when it\'s mutable', () => {
const mosaicInfo = new MosaicInfo(
mosaicInfoDTO.meta.active,
mosaicInfoDTO.meta.index,
mosaicInfoDTO.meta.id,
mosaicInfoDTO.mosaic.mosaicId,
mosaicInfoDTO.mosaic.nonce,
mosaicInfoDTO.mosaic.supply,
mosaicInfoDTO.mosaic.height,
mosaicInfoDTO.mosaic.owner,
mosaicInfoDTO.mosaic.revision,
MosaicProperties.create({
supplyMutable: true,
transferable: false,
Expand All @@ -210,14 +186,12 @@ describe('MosaicInfo', () => {

it('should return false when it\'s immutable', () => {
const mosaicInfo = new MosaicInfo(
mosaicInfoDTO.meta.active,
mosaicInfoDTO.meta.index,
mosaicInfoDTO.meta.id,
mosaicInfoDTO.mosaic.mosaicId,
mosaicInfoDTO.mosaic.nonce,
mosaicInfoDTO.mosaic.supply,
mosaicInfoDTO.mosaic.height,
mosaicInfoDTO.mosaic.owner,
mosaicInfoDTO.mosaic.revision,
MosaicProperties.create({
supplyMutable: false,
transferable: false,
Expand Down
8 changes: 6 additions & 2 deletions test/model/mosaic/MosaicView.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,13 @@ describe('MosaicView', () => {
let mosaicInfo: MosaicInfo;

before(() => {
mosaicInfo = new MosaicInfo(true, 0, '59FDA0733F17CF0001772CBC', new MosaicId([3294802500, 2243684972]),
new UInt64([1, 0]), new UInt64([3403414400, 2095475]), new UInt64([1, 0]),
mosaicInfo = new MosaicInfo(
'59FDA0733F17CF0001772CBC',
new MosaicId([3294802500, 2243684972]),
new UInt64([3403414400, 2095475]), // supply
new UInt64([1, 0]), // height
PublicAccount.createFromPublicKey('B4F12E7C9F6946091E2CB8B6D3A12B50D17CCBBF646386EA27CE2946A7423DCF', NetworkType.MIJIN_TEST),
1, // revision
MosaicProperties.create({
supplyMutable: true,
transferable: true,
Expand Down