Skip to content

Commit 84c8c4f

Browse files
committed
Restored account property http back to swagger gen
Removed ModifyMultiSigAccount linstener test as the channle doesn't exit
1 parent 9ffb132 commit 84c8c4f

File tree

4 files changed

+8
-38
lines changed

4 files changed

+8
-38
lines changed

e2e/infrastructure/AccountHttp.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ describe('AccountHttp', () => {
166166
describe('getAccountProperty', () => {
167167
it('should call getAccountProperty successfully', (done) => {
168168
setTimeout(() => {
169-
accountHttp.getAccountProperty(accountAddress).subscribe((accountProperty) => {
169+
accountHttp.getAccountProperties(accountAddress).subscribe((accountProperty) => {
170170
deepEqual(accountProperty.accountProperties.address, accountAddress);
171171
done();
172172
});
@@ -177,7 +177,7 @@ describe('AccountHttp', () => {
177177
describe('getAccountProperties', () => {
178178
it('should call getAccountProperties successfully', (done) => {
179179
setTimeout(() => {
180-
accountHttp.getAccountProperties([accountAddress]).subscribe((accountProperties) => {
180+
accountHttp.getAccountPropertiesFromAccounts([accountAddress]).subscribe((accountProperties) => {
181181
deepEqual(accountProperties[0]!.accountProperties.address, accountAddress);
182182
done();
183183
});

e2e/infrastructure/Listener.spec.ts

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -284,36 +284,6 @@ describe('Listener', () => {
284284
TransactionUtils.createAndAnnounce(account, account2.address, transactionHttp, mosaics);
285285
});
286286
});
287-
// describe('ModifyMultisigAccountTransaction', () => {
288-
// let listener: Listener;
289-
// before (() => {
290-
// listener = new Listener(config.apiUrl);
291-
// return listener.open();
292-
// });
293-
// after(() => {
294-
// return listener.close();
295-
// });
296-
// it('Multisig Account Added', (done) => {
297-
// const modifyMultisigAccountTransaction = ModifyMultisigAccountTransaction.create(
298-
// Deadline.create(),
299-
// 1,
300-
// 1,
301-
// [ new MultisigCosignatoryModification(MultisigCosignatoryModificationType.Add, cosignAccount1.publicAccount),
302-
// ],
303-
// NetworkType.MIJIN_TEST,
304-
// );
305-
// const signedTransaction = multisigAccount.sign(modifyMultisigAccountTransaction);
306-
// listener.multisigAccountAdded(cosignAccount1.address).subscribe((res) => {
307-
// done();
308-
// });
309-
// listener.status(multisigAccount.address).subscribe((error) => {
310-
// console.log('Error:', error);
311-
// assert(false);
312-
// done();
313-
// });
314-
// transactionHttp.announce(signedTransaction);
315-
// });
316-
// });
317287

318288
describe('New Block', () => {
319289
let listener: Listener;

src/infrastructure/AccountHttp.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ export class AccountHttp extends Http implements AccountRepository {
8686
* @param publicAccount public account
8787
* @returns Observable<AccountProperty>
8888
*/
89-
public getAccountProperty(address: Address): Observable<AccountPropertiesInfo> {
90-
return observableFrom(this.accountRoutesApi.getAccountProperty(address.plain())).pipe(map((accountProperties) => {
89+
public getAccountProperties(address: Address): Observable<AccountPropertiesInfo> {
90+
return observableFrom(this.accountRoutesApi.getAccountProperties(address.plain())).pipe(map((accountProperties) => {
9191
return DtoMapping.extractAccountPropertyFromDto(accountProperties);
9292
}));
9393
}
@@ -97,10 +97,10 @@ export class AccountHttp extends Http implements AccountRepository {
9797
* @param address list of addresses
9898
* @returns Observable<AccountProperty[]>
9999
*/
100-
public getAccountProperties(addresses: Address[]): Observable<AccountPropertiesInfo[]> {
100+
public getAccountPropertiesFromAccounts(addresses: Address[]): Observable<AccountPropertiesInfo[]> {
101101
const accountIds = addresses.map((address) => address.plain());
102102
return observableFrom(
103-
this.accountRoutesApi.getAccountProperties(accountIds)).pipe(map((accountProperties) => {
103+
this.accountRoutesApi.getAccountPropertiesFromAccounts(accountIds)).pipe(map((accountProperties) => {
104104
return accountProperties.map((property) => {
105105
return DtoMapping.extractAccountPropertyFromDto(property);
106106
});

src/infrastructure/AccountRepository.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,14 @@ export interface AccountRepository {
5151
* @param publicAccount public account
5252
* @returns Observable<AccountProperty>
5353
*/
54-
getAccountProperty(address: Address): Observable<AccountPropertiesInfo>;
54+
getAccountProperties(address: Address): Observable<AccountPropertiesInfo>;
5555

5656
/**
5757
* Gets Account properties.
5858
* @param address list of addresses
5959
* @returns Observable<AccountProperty[]>
6060
*/
61-
getAccountProperties(addresses: Address[]): Observable<AccountPropertiesInfo[]>;
61+
getAccountPropertiesFromAccounts(addresses: Address[]): Observable<AccountPropertiesInfo[]>;
6262

6363
/**
6464
* Gets a MultisigAccountInfo for an account.

0 commit comments

Comments
 (0)