Skip to content

Commit fb0e64c

Browse files
rg911rg911
committed
Removed and transaction type enum & sperate account property versions
1 parent f0b5fcf commit fb0e64c

9 files changed

+34
-92
lines changed

‎src/infrastructure/AccountHttp.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ export class AccountHttp extends Http implements AccountRepository {
165165
* @param address - User address
166166
* @returns Observable<MultisigAccountGraphInfo>
167167
*/
168-
public getMultisigAccountGraphInfo(address: Address): Observable<MultisigAccountGraphInfo > {
168+
public getMultisigAccountGraphInfo(address: Address): Observable<MultisigAccountGraphInfo> {
169169
return this.getNetworkTypeObservable().pipe(
170170
mergeMap((networkType) => observableFrom(
171171
this.accountRoutesApi.getAccountMultisigGraph(address.plain())).pipe(map((multisigAccountGraphInfosDTO) => {
@@ -195,7 +195,7 @@ export class AccountHttp extends Http implements AccountRepository {
195195
* @returns Observable<Transaction[]>
196196
*/
197197
public transactions(publicAccount: PublicAccount,
198-
queryParams?: QueryParams): Observable<Transaction[] > {
198+
queryParams?: QueryParams): Observable<Transaction[]> {
199199
return observableFrom(
200200
this.accountRoutesApi.transactions(publicAccount.publicKey, queryParams != null ? queryParams : {})).pipe(
201201
map((transactionsDTO) => {
@@ -212,7 +212,7 @@ export class AccountHttp extends Http implements AccountRepository {
212212
* @param queryParams - (Optional) Query params
213213
* @returns Observable<Transaction[]>
214214
*/
215-
public incomingTransactions(publicAccount: PublicAccount, queryParams?: QueryParams): Observable < Transaction[] > {
215+
public incomingTransactions(publicAccount: PublicAccount, queryParams?: QueryParams): Observable <Transaction[]> {
216216
return observableFrom(
217217
this.accountRoutesApi.incomingTransactions(publicAccount.publicKey, queryParams != null ? queryParams : {})).pipe(
218218
map((transactionsDTO) => {
@@ -229,7 +229,7 @@ export class AccountHttp extends Http implements AccountRepository {
229229
* @param queryParams - (Optional) Query params
230230
* @returns Observable<Transaction[]>
231231
*/
232-
public outgoingTransactions(publicAccount: PublicAccount, queryParams?: QueryParams): Observable < Transaction[] > {
232+
public outgoingTransactions(publicAccount: PublicAccount, queryParams?: QueryParams): Observable <Transaction[]> {
233233
return observableFrom(
234234
this.accountRoutesApi.outgoingTransactions(publicAccount.publicKey, queryParams != null ? queryParams : {})).pipe(
235235
map((transactionsDTO) => {
@@ -247,7 +247,7 @@ export class AccountHttp extends Http implements AccountRepository {
247247
* @param queryParams - (Optional) Query params
248248
* @returns Observable<Transaction[]>
249249
*/
250-
public unconfirmedTransactions(publicAccount: PublicAccount, queryParams?: QueryParams): Observable < Transaction[] > {
250+
public unconfirmedTransactions(publicAccount: PublicAccount, queryParams?: QueryParams): Observable <Transaction[]> {
251251
return observableFrom(
252252
this.accountRoutesApi.unconfirmedTransactions(publicAccount.publicKey, queryParams != null ? queryParams : {})).pipe(
253253
map((transactionsDTO) => {
@@ -264,7 +264,7 @@ export class AccountHttp extends Http implements AccountRepository {
264264
* @param queryParams - (Optional) Query params
265265
* @returns Observable<AggregateTransaction[]>
266266
*/
267-
public aggregateBondedTransactions(publicAccount: PublicAccount, queryParams?: QueryParams): Observable < AggregateTransaction[] > {
267+
public aggregateBondedTransactions(publicAccount: PublicAccount, queryParams?: QueryParams): Observable <AggregateTransaction[]> {
268268
return observableFrom(
269269
this.accountRoutesApi.partialTransactions(publicAccount.publicKey, queryParams != null ? queryParams : {})).pipe(
270270
map((transactionsDTO) => {

‎src/model/transaction/AccountPropertyModification.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export class AccountPropertyModification<T> {
2929
*/
3030
public readonly modificationType: PropertyModificationType,
3131
/**
32-
* Cosignatory public account.
32+
* Modification value (Address, Mosaic or Transaction Type).
3333
*/
3434
public readonly value: T) {
3535

‎src/model/transaction/AccountPropertyTransaction.ts‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import { AccountPropertyModification,
2323
PropertyModificationType, PropertyType } from '../model';
2424
import { MosaicId } from '../mosaic/MosaicId';
2525
import { Deadline } from './Deadline';
26-
import { TransactionTypeEnum } from './TransactionTypeEnum';
26+
import { TransactionType } from './TransactionType';
2727

2828
export class AccountPropertyTransaction {
2929
/**
@@ -34,10 +34,10 @@ export class AccountPropertyTransaction {
3434
* @param networkType - The network type.
3535
* @returns {ModifyAccountPropertyAddressTransaction}
3636
*/
37-
public static createAddressProertyModificationTransaction(deadline: Deadline,
38-
propertyType: PropertyType,
39-
modifications: Array<AccountPropertyModification<string>>,
40-
networkType: NetworkType): ModifyAccountPropertyAddressTransaction {
37+
public static createAddressPropertyModificationTransaction(deadline: Deadline,
38+
propertyType: PropertyType,
39+
modifications: Array<AccountPropertyModification<string>>,
40+
networkType: NetworkType): ModifyAccountPropertyAddressTransaction {
4141
if (![PropertyType.AllowAddress, PropertyType.BlockAddress].includes(propertyType)) {
4242
throw new Error ('Property type is not allowed.');
4343
}
@@ -110,9 +110,6 @@ export class AccountPropertyTransaction {
110110
*/
111111
public static createEntityTypeFilter(modificationType: PropertyModificationType,
112112
entityType: number): AccountPropertyModification<number> {
113-
if (!(entityType in TransactionTypeEnum)) {
114-
throw new Error('Not a transaction type');
115-
}
116113
return new AccountPropertyModification<number>(modificationType, entityType);
117114
}
118115
}

‎src/model/transaction/ModifyAccountPropertyAddressTransaction.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export class ModifyAccountPropertyAddressTransaction extends Transaction {
4141
modifications: Array<AccountPropertyModification<string>>,
4242
networkType: NetworkType): ModifyAccountPropertyAddressTransaction {
4343
return new ModifyAccountPropertyAddressTransaction(networkType,
44-
TransactionVersion.ACCOUNT_PROPERTY,
44+
TransactionVersion.ACCOUNT_PROPERTY_ADDRESS_TRANSACTION,
4545
deadline,
4646
new UInt64([0, 0]),
4747
propertyType,

‎src/model/transaction/ModifyAccountPropertyEntityTypeTransaction.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ export class ModifyAccountPropertyEntityTypeTransaction extends Transaction {
4242
modifications: Array<AccountPropertyModification<number>>,
4343
networkType: NetworkType): ModifyAccountPropertyEntityTypeTransaction {
4444
return new ModifyAccountPropertyEntityTypeTransaction(networkType,
45-
TransactionVersion.ACCOUNT_PROPERTY,
45+
TransactionVersion.ACCOUNT_PROPERTY_ENTITY_TYPE_TRANSACTION,
4646
deadline,
4747
new UInt64([0, 0]),
4848
propertyType,

‎src/model/transaction/ModifyAccountPropertyMosaicTransaction.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export class ModifyAccountPropertyMosaicTransaction extends Transaction {
4141
modifications: Array<AccountPropertyModification<number[]>>,
4242
networkType: NetworkType): ModifyAccountPropertyMosaicTransaction {
4343
return new ModifyAccountPropertyMosaicTransaction(networkType,
44-
TransactionVersion.ACCOUNT_PROPERTY,
44+
TransactionVersion.ACCOUNT_PROPERTY_MOSAIC_TRANSACTION,
4545
deadline,
4646
new UInt64([0, 0]),
4747
propertyType,

‎src/model/transaction/TransactionTypeEnum.ts‎

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎src/model/transaction/TransactionVersion.ts‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,20 @@ export class TransactionVersion {
9999
public static readonly MOSAIC_ALIAS = 1;
100100

101101
/**
102-
* Account Property transaction version
102+
* Account Property address transaction version
103103
* @type {number}
104104
*/
105-
public static readonly ACCOUNT_PROPERTY = 1;
105+
public static readonly ACCOUNT_PROPERTY_ADDRESS_TRANSACTION = 1;
106+
107+
/**
108+
* Account Property mosaic transaction version
109+
* @type {number}
110+
*/
111+
public static readonly ACCOUNT_PROPERTY_MOSAIC_TRANSACTION = 1;
112+
113+
/**
114+
* Account Property entity type transaction version
115+
* @type {number}
116+
*/
117+
public static readonly ACCOUNT_PROPERTY_ENTITY_TYPE_TRANSACTION = 1;
106118
}

‎test/model/transaction/AccountPropertyTransaction.spec.ts‎

Lines changed: 5 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,10 @@ import {expect} from 'chai';
1818
import {Account} from '../../../src/model/account/Account';
1919
import {Address} from '../../../src/model/account/Address';
2020
import {NetworkType} from '../../../src/model/blockchain/NetworkType';
21-
import { PropertyModificationType, PropertyType } from '../../../src/model/model';
21+
import { PropertyModificationType, PropertyType, TransactionType } from '../../../src/model/model';
2222
import {MosaicId} from '../../../src/model/mosaic/MosaicId';
2323
import {AccountPropertyTransaction} from '../../../src/model/transaction/AccountPropertyTransaction';
2424
import {Deadline} from '../../../src/model/transaction/Deadline';
25-
import { TransactionTypeEnum } from '../../../src/model/transaction/TransactionTypeEnum';
2625
import {TestingAccount} from '../../conf/conf.spec';
2726

2827
describe('AccountPropertyTransaction', () => {
@@ -53,7 +52,7 @@ describe('AccountPropertyTransaction', () => {
5352
});
5453

5554
it('should create entity type property filter', () => {
56-
const entityType = TransactionTypeEnum.ADDRESS_ALIAS;
55+
const entityType = TransactionType.ADDRESS_ALIAS;
5756
const entityTypePropertyFilter = AccountPropertyTransaction.createEntityTypeFilter(
5857
PropertyModificationType.Add,
5958
entityType,
@@ -62,24 +61,14 @@ describe('AccountPropertyTransaction', () => {
6261
expect(entityTypePropertyFilter.value).to.be.equal(entityType);
6362
});
6463

65-
it('should throw exception when entity type property filter passed in wrong type', () => {
66-
const entityType = -99;
67-
expect(() => {
68-
const filter = AccountPropertyTransaction.createEntityTypeFilter(
69-
PropertyModificationType.Add,
70-
entityType,
71-
);
72-
}).to.throw(Error, 'Not a transaction type');
73-
});
74-
7564
it('should create address property transaction', () => {
7665

7766
const address = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC');
7867
const addressPropertyFilter = AccountPropertyTransaction.createAddressFilter(
7968
PropertyModificationType.Add,
8069
address,
8170
);
82-
const addressPropertyTransaction = AccountPropertyTransaction.createAddressProertyModificationTransaction(
71+
const addressPropertyTransaction = AccountPropertyTransaction.createAddressPropertyModificationTransaction(
8372
Deadline.create(),
8473
PropertyType.AllowAddress,
8574
[addressPropertyFilter],
@@ -104,7 +93,7 @@ describe('AccountPropertyTransaction', () => {
10493
);
10594

10695
expect(() => {
107-
AccountPropertyTransaction.createAddressProertyModificationTransaction(
96+
AccountPropertyTransaction.createAddressPropertyModificationTransaction(
10897
Deadline.create(),
10998
PropertyType.Sentinel,
11099
[addressPropertyFilter],
@@ -158,7 +147,7 @@ describe('AccountPropertyTransaction', () => {
158147

159148
it('should create entity type property transaction', () => {
160149

161-
const entityType = TransactionTypeEnum.ADDRESS_ALIAS;
150+
const entityType = TransactionType.ADDRESS_ALIAS;
162151
const entityTypePropertyFilter = AccountPropertyTransaction.createEntityTypeFilter(
163152
PropertyModificationType.Add,
164153
entityType,
@@ -178,23 +167,4 @@ describe('AccountPropertyTransaction', () => {
178167
)).to.be.equal('0401004E42');
179168

180169
});
181-
182-
it('should throw exception when create entity type property transaction with wrong type', () => {
183-
184-
const entityType = TransactionTypeEnum.ADDRESS_ALIAS;
185-
const entityTypePropertyFilter = AccountPropertyTransaction.createEntityTypeFilter(
186-
PropertyModificationType.Add,
187-
entityType,
188-
);
189-
190-
expect(() => {
191-
AccountPropertyTransaction.createEntityTypePropertyModificationTransaction(
192-
Deadline.create(),
193-
PropertyType.Sentinel,
194-
[entityTypePropertyFilter],
195-
NetworkType.MIJIN_TEST,
196-
);
197-
}).to.throw(Error, 'Property type is not allowed.');
198-
199-
});
200170
});

0 commit comments

Comments
 (0)