Skip to content

Elephant 3 Compatible #249

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 10 commits into from
Sep 16, 2019
Merged

Elephant 3 Compatible #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3c50732
Applied Elephant3 catbuffer codes
rg911 Sep 2, 2019
3a75c1e
Model / class - catbuffer consistency renaming
rg911 Sep 2, 2019
b233871
Re-applied latest OpenAPI generated code (v.0.7.18)
rg911 Sep 4, 2019
9b630c0
- Latest OpenAPI Dtos applied
rg911 Sep 9, 2019
6b8c7b3
Fixed e2d tests
rg911 Sep 11, 2019
8dc12f3
- Refactored mosaic property
rg911 Sep 11, 2019
e157d43
- Removed cosign transaction `isAnnounced`
rg911 Sep 11, 2019
540412d
throw execption when use transactionHttp.announce to announce aggrega…
rg911 Sep 11, 2019
5e95c84
Fixed bug on transactionHttp aggregateBonded announce check
rg911 Sep 13, 2019
4f86890
- Refactored to use factory method for NamespaceId creation
rg911 Sep 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
62 changes: 30 additions & 32 deletions e2e/infrastructure/AccountHttp.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ import {assert, expect} from 'chai';
import {AccountHttp} from '../../src/infrastructure/AccountHttp';
import { Listener, TransactionHttp } from '../../src/infrastructure/infrastructure';
import { Account } from '../../src/model/account/Account';
import { AccountRestrictionModificationAction } from '../../src/model/account/AccountRestrictionModificationAction';
import { AccountRestrictionType } from '../../src/model/account/AccountRestrictionType';
import {Address} from '../../src/model/account/Address';
import {PublicAccount} from '../../src/model/account/PublicAccount';
import { RestrictionModificationType } from '../../src/model/account/RestrictionModificationType';
import {NetworkType} from '../../src/model/blockchain/NetworkType';
import { NetworkCurrencyMosaic } from '../../src/model/mosaic/NetworkCurrencyMosaic';
import { AliasAction } from '../../src/model/namespace/AliasAction';
Expand All @@ -31,12 +31,12 @@ import { AccountRestrictionModification } from '../../src/model/transaction/Acco
import { AccountRestrictionTransaction } from '../../src/model/transaction/AccountRestrictionTransaction';
import { AddressAliasTransaction } from '../../src/model/transaction/AddressAliasTransaction';
import { AggregateTransaction } from '../../src/model/transaction/AggregateTransaction';
import { CosignatoryModificationAction } from '../../src/model/transaction/CosignatoryModificationAction';
import { Deadline } from '../../src/model/transaction/Deadline';
import { ModifyMultisigAccountTransaction } from '../../src/model/transaction/ModifyMultisigAccountTransaction';
import { MultisigAccountModificationTransaction } from '../../src/model/transaction/MultisigAccountModificationTransaction';
import { MultisigCosignatoryModification } from '../../src/model/transaction/MultisigCosignatoryModification';
import { MultisigCosignatoryModificationType } from '../../src/model/transaction/MultisigCosignatoryModificationType';
import { NamespaceRegistrationTransaction } from '../../src/model/transaction/NamespaceRegistrationTransaction';
import { PlainMessage } from '../../src/model/transaction/PlainMessage';
import { RegisterNamespaceTransaction } from '../../src/model/transaction/RegisterNamespaceTransaction';
import { TransferTransaction } from '../../src/model/transaction/TransferTransaction';
import { UInt64 } from '../../src/model/UInt64';

Expand Down Expand Up @@ -129,12 +129,12 @@ describe('AccountHttp', () => {
after(() => {
return listener.close();
});
it('Announce RegisterNamespaceTransaction', (done) => {
it('Announce NamespaceRegistrationTransaction', (done) => {
const namespaceName = 'root-test-namespace-' + Math.floor(Math.random() * 10000);
const registerNamespaceTransaction = RegisterNamespaceTransaction.createRootNamespace(
const registerNamespaceTransaction = NamespaceRegistrationTransaction.createRootNamespace(
Deadline.create(),
namespaceName,
UInt64.fromUint(1000),
UInt64.fromUint(9),
NetworkType.MIJIN_TEST,
);
namespaceId = new NamespaceId(namespaceName);
Expand Down Expand Up @@ -183,7 +183,7 @@ describe('AccountHttp', () => {
});
});

describe('Setup Test AccountAddressProperty', () => {
describe('Setup Test AccountAddressRestriction', () => {
let listener: Listener;
before (() => {
listener = new Listener(config.apiUrl);
Expand All @@ -195,17 +195,16 @@ describe('AccountHttp', () => {

it('Announce AccountRestrictionTransaction', (done) => {
const addressPropertyFilter = AccountRestrictionModification.createForAddress(
RestrictionModificationType.Add,
AccountRestrictionModificationAction.Add,
account3.address,
);
const addressModification = AccountRestrictionTransaction.createAddressRestrictionModificationTransaction(
Deadline.create(),
AccountRestrictionType.BlockIncomingAddress,
AccountRestrictionType.AllowIncomingAddress,
[addressPropertyFilter],
NetworkType.MIJIN_TEST,
);
const signedTransaction = addressModification.signWith(account, generationHash);

listener.confirmed(account.address).subscribe(() => {
done();
});
Expand All @@ -226,14 +225,14 @@ describe('AccountHttp', () => {
after(() => {
return listener.close();
});
it('Announce ModifyMultisigAccountTransaction', (done) => {
const modifyMultisigAccountTransaction = ModifyMultisigAccountTransaction.create(
it('Announce MultisigAccountModificationTransaction', (done) => {
const modifyMultisigAccountTransaction = MultisigAccountModificationTransaction.create(
Deadline.create(),
2,
1,
[ new MultisigCosignatoryModification(MultisigCosignatoryModificationType.Add, cosignAccount1.publicAccount),
new MultisigCosignatoryModification(MultisigCosignatoryModificationType.Add, cosignAccount2.publicAccount),
new MultisigCosignatoryModification(MultisigCosignatoryModificationType.Add, cosignAccount3.publicAccount),
[ new MultisigCosignatoryModification(CosignatoryModificationAction.Add, cosignAccount1.publicAccount),
new MultisigCosignatoryModification(CosignatoryModificationAction.Add, cosignAccount2.publicAccount),
new MultisigCosignatoryModification(CosignatoryModificationAction.Add, cosignAccount3.publicAccount),
],
NetworkType.MIJIN_TEST,
);
Expand Down Expand Up @@ -307,7 +306,7 @@ describe('AccountHttp', () => {
describe('getMultisigAccountGraphInfo', () => {
it('should call getMultisigAccountGraphInfo successfully', (done) => {
setTimeout(() => {
accountHttp.getMultisigAccountGraphInfo(multisigAccount.address).subscribe((multisigAccountGraphInfo) => {
accountHttp.getMultisigAccountGraphInfo(multisigAccount.publicAccount.address).subscribe((multisigAccountGraphInfo) => {
expect(multisigAccountGraphInfo.multisigAccounts.get(0)![0].
account.publicKey).to.be.equal(multisigAccount.publicKey);
done();
Expand All @@ -318,7 +317,7 @@ describe('AccountHttp', () => {
describe('getMultisigAccountInfo', () => {
it('should call getMultisigAccountInfo successfully', (done) => {
setTimeout(() => {
accountHttp.getMultisigAccountInfo(multisigAccount.address).subscribe((multisigAccountInfo) => {
accountHttp.getMultisigAccountInfo(multisigAccount.publicAccount.address).subscribe((multisigAccountInfo) => {
expect(multisigAccountInfo.account.publicKey).to.be.equal(multisigAccount.publicKey);
done();
});
Expand All @@ -328,7 +327,7 @@ describe('AccountHttp', () => {

describe('outgoingTransactions', () => {
it('should call outgoingTransactions successfully', (done) => {
accountHttp.outgoingTransactions(publicAccount).subscribe((transactions) => {
accountHttp.outgoingTransactions(publicAccount.address).subscribe((transactions) => {
expect(transactions.length).to.be.greaterThan(0);
done();
});
Expand All @@ -337,7 +336,7 @@ describe('AccountHttp', () => {

describe('aggregateBondedTransactions', () => {
it('should call aggregateBondedTransactions successfully', (done) => {
accountHttp.aggregateBondedTransactions(publicAccount).subscribe(() => {
accountHttp.aggregateBondedTransactions(publicAccount.address).subscribe(() => {
done();
}, (error) => {
console.log('Error:', error);
Expand All @@ -348,7 +347,7 @@ describe('AccountHttp', () => {

describe('transactions', () => {
it('should call transactions successfully', (done) => {
accountHttp.transactions(publicAccount).subscribe((transactions) => {
accountHttp.transactions(publicAccount.address).subscribe((transactions) => {
expect(transactions.length).to.be.greaterThan(0);
done();
});
Expand All @@ -357,7 +356,7 @@ describe('AccountHttp', () => {

describe('unconfirmedTransactions', () => {
it('should call unconfirmedTransactions successfully', (done) => {
accountHttp.unconfirmedTransactions(publicAccount).subscribe((transactions) => {
accountHttp.unconfirmedTransactions(publicAccount.address).subscribe((transactions) => {
expect(transactions.length).to.be.equal(0);
done();
});
Expand Down Expand Up @@ -421,17 +420,16 @@ describe('AccountHttp', () => {

it('Announce AccountRestrictionTransaction', (done) => {
const addressPropertyFilter = AccountRestrictionModification.createForAddress(
RestrictionModificationType.Remove,
AccountRestrictionModificationAction.Remove,
account3.address,
);
const addressModification = AccountRestrictionTransaction.createAddressRestrictionModificationTransaction(
Deadline.create(),
AccountRestrictionType.BlockIncomingAddress,
AccountRestrictionType.AllowIncomingAddress,
[addressPropertyFilter],
NetworkType.MIJIN_TEST,
);
const signedTransaction = addressModification.signWith(account, generationHash);

listener.confirmed(account.address).subscribe(() => {
done();
});
Expand All @@ -453,29 +451,29 @@ describe('AccountHttp', () => {
after(() => {
return listener.close();
});
it('Announce ModifyMultisigAccountTransaction', (done) => {
const removeCosigner1 = ModifyMultisigAccountTransaction.create(
it('Announce MultisigAccountModificationTransaction', (done) => {
const removeCosigner1 = MultisigAccountModificationTransaction.create(
Deadline.create(),
-1,
0,
[ new MultisigCosignatoryModification(MultisigCosignatoryModificationType.Remove, cosignAccount1.publicAccount),
[ new MultisigCosignatoryModification(CosignatoryModificationAction.Remove, cosignAccount1.publicAccount),
],
NetworkType.MIJIN_TEST,
);
const removeCosigner2 = ModifyMultisigAccountTransaction.create(
const removeCosigner2 = MultisigAccountModificationTransaction.create(
Deadline.create(),
0,
0,
[ new MultisigCosignatoryModification(MultisigCosignatoryModificationType.Remove, cosignAccount2.publicAccount),
[ new MultisigCosignatoryModification(CosignatoryModificationAction.Remove, cosignAccount2.publicAccount),
],
NetworkType.MIJIN_TEST,
);

const removeCosigner3 = ModifyMultisigAccountTransaction.create(
const removeCosigner3 = MultisigAccountModificationTransaction.create(
Deadline.create(),
-1,
-1,
[ new MultisigCosignatoryModification(MultisigCosignatoryModificationType.Remove, cosignAccount3.publicAccount),
[ new MultisigCosignatoryModification(CosignatoryModificationAction.Remove, cosignAccount3.publicAccount),
],
NetworkType.MIJIN_TEST,
);
Expand Down
6 changes: 2 additions & 4 deletions e2e/infrastructure/BlockHttp.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,7 @@ describe('BlockHttp', () => {
it('should return Merkle Receipts', (done) => {
blockHttp.getMerkleReceipts(chainHeight, blockReceiptHash)
.subscribe((merkleReceipts) => {
expect(merkleReceipts.type).not.to.be.null;
expect(merkleReceipts.payload).not.to.be.null;
expect(merkleReceipts.merklePath).not.to.be.null;
done();
});
});
Expand All @@ -155,8 +154,7 @@ describe('BlockHttp', () => {
it('should return Merkle Transaction', (done) => {
blockHttp.getMerkleTransaction(chainHeight, blockTransactionHash)
.subscribe((merkleTransactionss) => {
expect(merkleTransactionss.type).not.to.be.null;
expect(merkleTransactionss.payload).not.to.be.null;
expect(merkleTransactionss.merklePath).not.to.be.null;
done();
});
});
Expand Down
2 changes: 1 addition & 1 deletion e2e/infrastructure/ChainHttp.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ describe('ChainHttp', () => {

describe('getBlockchainScore', () => {
it('should return blockchain score', (done) => {
chainHttp.getBlockchainScore()
chainHttp.getChainScore()
.subscribe((blockchainScore) => {
expect(blockchainScore.scoreLow).to.not.be.equal(undefined);
expect(blockchainScore.scoreHigh.lower).to.be.equal(0);
Expand Down
Loading