Skip to content

Commit

Permalink
made timeout configurable
Browse files Browse the repository at this point in the history
  • Loading branch information
@tonowie
tonowie committed May 11, 2019
1 parent 996e8e8 commit e6452e3
Show file tree
Hide file tree
Showing 8 changed files with 44 additions and 43 deletions.
5 changes: 3 additions & 2 deletions src/integration-test/java/io/proximax/sdk/BaseTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,9 @@ public abstract class BaseTest {
protected static final NamespaceId PROXIMA_NAMESPACE = new NamespaceId(NAMESPACE_PRX_NAME);

/** network type for IT tests */
protected static final NetworkType NETWORK_TYPE = NetworkType.MIJIN_TEST;

protected static final NetworkType NETWORK_TYPE = NetworkType.TEST_NET;
/** timeout in seconds to wait for response */
protected static final Integer WAIT_TIMEOUT_SECONDS = 30;

private static final String SYS_ENV_PRIVATE_KEY = "SEED_ACCOUNT_PRIVATE_KEY";

Expand Down
12 changes: 6 additions & 6 deletions src/integration-test/java/io/proximax/sdk/E2EAliasTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,31 +99,31 @@ void test01PrepareData() {
transactionHttp.announce(signedTransaction).blockingFirst();
logger.info("Registered namespace {}. {}",
ROOT_NAME,
listener.confirmed(seedAccount.getAddress()).timeout(30, TimeUnit.SECONDS).blockingFirst());
listener.confirmed(seedAccount.getAddress()).timeout(WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS).blockingFirst());
// create child namespace for mosaic
RegisterNamespaceTransaction registerChildNamespaceTransaction = RegisterNamespaceTransaction
.createSubNamespace(getDeadline(), CHILD1_NAME, rootId, NETWORK_TYPE);
SignedTransaction signedChildTransaction = seedAccount.sign(registerChildNamespaceTransaction);
transactionHttp.announce(signedChildTransaction).blockingFirst();
logger.info("Registered namespace {}. {}",
CHILD1_NAME,
listener.confirmed(seedAccount.getAddress()).timeout(30, TimeUnit.SECONDS).blockingFirst());
listener.confirmed(seedAccount.getAddress()).timeout(WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS).blockingFirst());
// create child namespace for account
RegisterNamespaceTransaction accNamespace = RegisterNamespaceTransaction
.createSubNamespace(getDeadline(), CHILD2_NAME, rootId, NETWORK_TYPE);
SignedTransaction accNamespaceSigned = seedAccount.sign(accNamespace);
transactionHttp.announce(accNamespaceSigned).blockingFirst();
logger.info("Registered namespace {}. {}",
CHILD2_NAME,
listener.confirmed(seedAccount.getAddress()).timeout(30, TimeUnit.SECONDS).blockingFirst());
listener.confirmed(seedAccount.getAddress()).timeout(WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS).blockingFirst());
// create mosaic
logger.info("Creating new mosaic");
SignedTransaction mdt = MosaicDefinitionTransaction.create(mosaicNonce,
mosaicId,
getDeadline(),
new MosaicProperties(true, true, false, 6, BigInteger.valueOf(200)),
NETWORK_TYPE).signWith(seedAccount);
Observable<Transaction> confirmation = listener.confirmed(seedAccount.getAddress()).timeout(30, TimeUnit.SECONDS);
Observable<Transaction> confirmation = listener.confirmed(seedAccount.getAddress()).timeout(WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS);
transactionHttp.announce(mdt).blockingFirst();
logger.info("Mosaic created. {}", confirmation.blockingFirst());
}
Expand All @@ -134,7 +134,7 @@ void test02CreateMosaicAlias() {
SignedTransaction signed = seedAccount.sign(alias);
transactionHttp.announce(signed).blockingFirst();
logger.info("created alias. {}",
listener.confirmed(seedAccount.getAddress()).timeout(30, TimeUnit.SECONDS).blockingFirst());
listener.confirmed(seedAccount.getAddress()).timeout(WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS).blockingFirst());
}

@Test
Expand All @@ -146,7 +146,7 @@ void test03CreateAccountAlias() {
SignedTransaction signed = seedAccount.sign(alias);
transactionHttp.announce(signed).blockingFirst();
logger.info("created alias. {}",
listener.confirmed(seedAccount.getAddress()).timeout(30, TimeUnit.SECONDS).blockingFirst());
listener.confirmed(seedAccount.getAddress()).timeout(WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS).blockingFirst());
}

@Test
Expand Down
10 changes: 5 additions & 5 deletions src/integration-test/java/io/proximax/sdk/E2EMetadataTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ void add01MetadataToAccount() {
SignedTransaction signedAddMeta = target.sign(addMeta);
transactionHttp.announce(signedAddMeta).blockingFirst();
logger.info("Transfer done. {}",
listener.confirmed(target.getAddress()).timeout(30, TimeUnit.SECONDS).blockingFirst());
listener.confirmed(target.getAddress()).timeout(WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS).blockingFirst());
// check the meta
Metadata meta = metadataHttp.getMetadata(target.getAddress()).blockingFirst();
checkMeta(meta, MetadataType.ADDRESS, new Field("tono", "a"));
Expand All @@ -91,7 +91,7 @@ void add02MetadataToMosaic() {
getDeadline(),
new MosaicProperties(true, true, false, 6, BigInteger.valueOf(20)),
NETWORK_TYPE).signWith(seedAccount);
Observable<Transaction> confirmation = listener.confirmed(seedAccount.getAddress()).timeout(30, TimeUnit.SECONDS);
Observable<Transaction> confirmation = listener.confirmed(seedAccount.getAddress()).timeout(WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS);
transactionHttp.announce(mdt).blockingFirst();
logger.info("Mosaic created. {}", confirmation.blockingFirst());
// now add metadata to the mosaic
Expand All @@ -100,7 +100,7 @@ void add02MetadataToMosaic() {
.signWith(seedAccount);
transactionHttp.announce(signedAddMeta).blockingFirst();
logger.info("Meta added to mosaic. {}",
listener.confirmed(seedAccount.getAddress()).timeout(30, TimeUnit.SECONDS).blockingFirst());
listener.confirmed(seedAccount.getAddress()).timeout(WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS).blockingFirst());
// check the meta
Metadata meta = metadataHttp.getMetadata(id).blockingFirst();
checkMeta(meta, MetadataType.MOSAIC, new Field("tono", "mosaic"));
Expand All @@ -120,14 +120,14 @@ void add03MetadataToNamespace() {
transactionHttp.announce(signedTransaction).blockingFirst();
logger.info("Registered namespace {}. {}",
name,
listener.confirmed(seedAccount.getAddress()).timeout(30, TimeUnit.SECONDS).blockingFirst());
listener.confirmed(seedAccount.getAddress()).timeout(WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS).blockingFirst());
// now add metadata to the namespace
List<MetadataModification> mods = Arrays.asList(MetadataModification.add("tono", "namespace"));
SignedTransaction signedAddMeta = ModifyMetadataTransaction
.createForNamespace(getDeadline(), rootId, mods, NETWORK_TYPE).signWith(seedAccount);
transactionHttp.announce(signedAddMeta).blockingFirst();
logger.info("Meta added to namespace. {}",
listener.confirmed(seedAccount.getAddress()).timeout(30, TimeUnit.SECONDS).blockingFirst());
listener.confirmed(seedAccount.getAddress()).timeout(WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS).blockingFirst());
// check the meta
Metadata meta = metadataHttp.getMetadata(rootId).blockingFirst();
checkMeta(meta, MetadataType.NAMESPACE, new Field("tono", "namespace"));
Expand Down
8 changes: 4 additions & 4 deletions src/integration-test/java/io/proximax/sdk/E2EMosaicTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ void test01CreateMosaic() {
getDeadline(),
new MosaicProperties(true, true, false, 6, BigInteger.valueOf(20)),
NETWORK_TYPE).signWith(seedAccount);
Observable<Transaction> confirmation = listener.confirmed(seedAccount.getAddress()).timeout(30, TimeUnit.SECONDS);
Observable<Transaction> confirmation = listener.confirmed(seedAccount.getAddress()).timeout(WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS);
transactionHttp.announce(mdt).blockingFirst();
logger.info("Mosaic created. {}", confirmation.blockingFirst());
// verify that mosaic looks fine
Expand All @@ -96,7 +96,7 @@ void test02ChangeSupply() {
.signWith(seedAccount);
transactionHttp.announce(supplychange).blockingFirst();
logger.info("Supply changed. {}",
listener.confirmed(seedAccount.getAddress()).timeout(30, TimeUnit.SECONDS).blockingFirst());
listener.confirmed(seedAccount.getAddress()).timeout(WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS).blockingFirst());
// verify that mosaic looks fine
MosaicInfo info = mosaicHttp.getMosaic(id).blockingFirst();
assertEquals(BigInteger.TEN, info.getSupply());
Expand All @@ -110,7 +110,7 @@ void test03DecreaseSupply() {
.signWith(seedAccount);
transactionHttp.announce(supplychange).blockingFirst();
logger.info("Supply changed. {}",
listener.confirmed(seedAccount.getAddress()).timeout(30, TimeUnit.SECONDS).blockingFirst());
listener.confirmed(seedAccount.getAddress()).timeout(WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS).blockingFirst());
// verify that mosaic looks fine
MosaicInfo info = mosaicHttp.getMosaic(id).blockingFirst();
assertEquals(BigInteger.valueOf(9), info.getSupply());
Expand Down Expand Up @@ -147,7 +147,7 @@ void test04AggregateMosaic() {
transactionHttp.announce(signedTransaction).blockingFirst();
// wait for acceptance
logger.info("Aggregate mosaic done. {}",
listener.confirmed(seedAccount.getAddress()).timeout(30, TimeUnit.SECONDS).blockingFirst());
listener.confirmed(seedAccount.getAddress()).timeout(WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS).blockingFirst());
// verify that mosaic looks fine
MosaicInfo info = mosaicHttp.getMosaic(aId).blockingFirst();
assertEquals(BigInteger.valueOf(9), info.getSupply());
Expand Down
28 changes: 14 additions & 14 deletions src/integration-test/java/io/proximax/sdk/E2EMultisigTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ void test01CreateMultisig() throws InterruptedException, ExecutionException {
logger.info("Sent request: {}", transactionHttp.announce(signedChangeToMultisig).toFuture().get());
// verify that account is multisig
logger.info("request o create multisig confirmed: {}",
listener.confirmed(multisigAccount.getAddress()).timeout(30, TimeUnit.SECONDS).blockingFirst());
listener.confirmed(multisigAccount.getAddress()).timeout(WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS).blockingFirst());
testMultisigAccount(multisigAccount, true, 1, 1, 2, 2);
}

Expand All @@ -120,7 +120,7 @@ void test01TransferFromMultisig1Of2Aggregate() {
// announce the transfer
logger.info("Announced the aggregate complete transfer from multisig: {}",
transactionHttp.announce(signedTransaction).blockingFirst());
logger.info("request to transfer confirmed: {}", listener.confirmed(cosig1.getAddress()).timeout(30, TimeUnit.SECONDS).blockingFirst());
logger.info("request to transfer confirmed: {}", listener.confirmed(cosig1.getAddress()).timeout(WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS).blockingFirst());
}

@Test
Expand Down Expand Up @@ -150,11 +150,11 @@ void test01TransferFromMultisig1Of2AggregateBonded() {
logger.info("Sent request to lock funds before transfer: {}",
transactionHttp.announce(lockFundsTransactionSigned).blockingFirst());
logger.info("request to transfer aggregate bonded confirmed: {}",
listener.confirmed(cosig1.getAddress()).timeout(30, TimeUnit.SECONDS).blockingFirst());
listener.confirmed(cosig1.getAddress()).timeout(WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS).blockingFirst());
// announce the multisig change as aggregate bounded
logger.info("Announced the aggregate bonded transfer from multisig: {}",
transactionHttp.announceAggregateBonded(signedTransaction).blockingFirst());
logger.info("request to make transfer confirmed: {}", listener.confirmed(cosig1.getAddress()).timeout(30, TimeUnit.SECONDS).blockingFirst());
logger.info("request to make transfer confirmed: {}", listener.confirmed(cosig1.getAddress()).timeout(WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS).blockingFirst());
}

@Test
Expand All @@ -173,7 +173,7 @@ void test02IncreaseMinApproval() throws InterruptedException, ExecutionException
logger.info("Sent request: {}", transactionHttp.announce(signedChangeTo2of2).toFuture().get());
// verify that min approvals is set to 2
logger.info("request to increase min approval confirmed: {}",
listener.confirmed(cosig1.getAddress()).timeout(30, TimeUnit.SECONDS).blockingFirst());
listener.confirmed(cosig1.getAddress()).timeout(WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS).blockingFirst());
testMultisigAccount(multisigAccount, true, 2, 1, 2, 2);
}

Expand All @@ -195,7 +195,7 @@ void test02TransferFromMultisig2Of2Aggregate() {
// announce the transfer
logger.info("Announced the transfer from multisig: {}",
transactionHttp.announce(signedTransaction).blockingFirst());
logger.info("request confirmed: {}", listener.confirmed(cosig1.getAddress()).timeout(30, TimeUnit.SECONDS).blockingFirst());
logger.info("request confirmed: {}", listener.confirmed(cosig1.getAddress()).timeout(WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS).blockingFirst());
}

@Test
Expand Down Expand Up @@ -225,11 +225,11 @@ void test02TransferFromMultisig2Of2AggregateBonded() {
// announce the lock transaction
logger.info("Sent request to lock funds: {}",
transactionHttp.announce(lockFundsTransactionSigned).blockingFirst());
logger.info("request confirmed: {}", listener.confirmed(cosig1.getAddress()).timeout(30, TimeUnit.SECONDS).blockingFirst());
logger.info("request confirmed: {}", listener.confirmed(cosig1.getAddress()).timeout(WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS).blockingFirst());
// announce the multisig change as aggregate bounded
logger.info("Announced the transfer from multisig: {}",
transactionHttp.announceAggregateBonded(signedTransaction).blockingFirst());
logger.info("request confirmed: {}", listener.confirmed(cosig1.getAddress()).timeout(30, TimeUnit.SECONDS).blockingFirst());
logger.info("request confirmed: {}", listener.confirmed(cosig1.getAddress()).timeout(WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS).blockingFirst());
}

@Test
Expand Down Expand Up @@ -258,11 +258,11 @@ void test02TransferFromMultisig2Of2AggregateBondedSeparateConfirmation() {
// announce the lock transaction
logger.info("Sent request to lock funds: {}",
transactionHttp.announce(lockFundsTransactionSigned).blockingFirst());
logger.info("request confirmed: {}", listener.confirmed(cosig1.getAddress()).timeout(30, TimeUnit.SECONDS).blockingFirst());
logger.info("request confirmed: {}", listener.confirmed(cosig1.getAddress()).timeout(WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS).blockingFirst());
// announce the multisig change as aggregate bounded
logger.info("Announced the transfer from multisig: {}",
transactionHttp.announceAggregateBonded(signedTransaction).blockingFirst());
logger.info("request confirmed: {}", listener.aggregateBondedAdded(cosig1.getAddress()).timeout(30, TimeUnit.SECONDS).blockingFirst());
logger.info("request confirmed: {}", listener.aggregateBondedAdded(cosig1.getAddress()).timeout(WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS).blockingFirst());
// cosign the request
cosignMultisigTransaction();
}
Expand Down Expand Up @@ -294,11 +294,11 @@ void test03AddCosignatory() throws InterruptedException, ExecutionException {
// announce the transaction
logger.info("Sent request to lock funds: {}",
transactionHttp.announce(lockFundsTransactionSigned).toFuture().get());
logger.info("request confirmed: {}", listener.confirmed(cosig1.getAddress()).timeout(30, TimeUnit.SECONDS).blockingFirst());
logger.info("request confirmed: {}", listener.confirmed(cosig1.getAddress()).timeout(WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS).blockingFirst());
// announce the multisig change as aggregate bounded
logger.info("Announced the multisig change: {}",
transactionHttp.announceAggregateBonded(signedTransaction).toFuture().get());
logger.info("request confirmed: {}", listener.aggregateBondedAdded(cosig1.getAddress()).timeout(30, TimeUnit.SECONDS).blockingFirst());
logger.info("request confirmed: {}", listener.aggregateBondedAdded(cosig1.getAddress()).timeout(WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS).blockingFirst());
// change should not be in effect yet
testMultisigAccount(multisigAccount, true, 2, 1, 2, 2);
}
Expand Down Expand Up @@ -327,7 +327,7 @@ void test05CreateMultilevelMultisig() throws InterruptedException, ExecutionExce
logger.info("Sent request: {}", transactionHttp.announce(signedChangeToMultisig).toFuture().get());
// verify that account is multisig
logger.info("request o create multilevel multisig confirmed: {}",
listener.confirmed(multiMultisigAccount.getAddress()).timeout(30, TimeUnit.SECONDS).blockingFirst());
listener.confirmed(multiMultisigAccount.getAddress()).timeout(WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS).blockingFirst());
testMultisigAccount(multiMultisigAccount, true, 1, 1, 2, 3);
}

Expand All @@ -345,7 +345,7 @@ private void cosignMultisigTransaction() {
}).count().blockingGet();
// make sure that we co-signed exactly one transaction
assertEquals(1, count);
logger.info("cosingned transactions: {}", listener.confirmed(cosig2.getAddress()).timeout(30, TimeUnit.SECONDS).blockingFirst());
logger.info("cosingned transactions: {}", listener.confirmed(cosig2.getAddress()).timeout(WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS).blockingFirst());
}

/**
Expand Down
10 changes: 5 additions & 5 deletions src/integration-test/java/io/proximax/sdk/E2ENamespaceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ void test01CreateRootNamespace() {
transactionHttp.announce(signedTransaction).blockingFirst();
logger.info("Registered namespace {}. {}",
ROOT_NAME,
listener.confirmed(seedAccount.getAddress()).timeout(30, TimeUnit.SECONDS).blockingFirst());
listener.confirmed(seedAccount.getAddress()).timeout(WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS).blockingFirst());
// check the namespace
checkNamespace(ROOT_NAME, Optional.empty(), 100);
}
Expand All @@ -93,7 +93,7 @@ void test02CreateChildNamespace() {
transactionHttp.announce(signedTransaction).blockingFirst();
logger.info("Registered namespace {}. {}",
CHILD1_NAME,
listener.confirmed(seedAccount.getAddress()).timeout(30, TimeUnit.SECONDS).blockingFirst());
listener.confirmed(seedAccount.getAddress()).timeout(WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS).blockingFirst());
// check the namespace
checkNamespace(CHILD1_NAME, Optional.of(ROOT_NAME), 100);
}
Expand All @@ -119,7 +119,7 @@ void test03CreateAggregateRootAndChild() {
transactionHttp.announce(signedTransaction).blockingFirst();
logger.info("Registered namespaces {}. {}",
CHILD1_NAME,
listener.confirmed(seedAccount.getAddress()).timeout(30, TimeUnit.SECONDS).blockingFirst());
listener.confirmed(seedAccount.getAddress()).timeout(WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS).blockingFirst());
// check the namespaces
checkNamespace(aggRootName, Optional.empty(), 100);
checkNamespace(CHILD1_NAME, Optional.of(aggRootName), 100);
Expand Down Expand Up @@ -161,13 +161,13 @@ private void checkNamespace(String name, Optional<String> parentName, long durat
}
logger.info("Checking namespace {}", nsId);
// retrieve the namespace and check it is OK
NamespaceInfo namespace = namespaceHttp.getNamespace(nsId).timeout(30, TimeUnit.SECONDS).blockingFirst();
NamespaceInfo namespace = namespaceHttp.getNamespace(nsId).timeout(WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS).blockingFirst();
// check for namespace properties
assertEquals(BigInteger.valueOf(duration), namespace.getEndHeight().subtract(namespace.getStartHeight()));
assertEquals(nsId.getId(), namespace.getId().getId());
// try to check name
NamespaceName nsName = namespaceHttp.getNamespaceNames(Arrays.asList(nsId)).flatMapIterable(list -> list)
.timeout(30, TimeUnit.SECONDS).blockingFirst();
.timeout(WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS).blockingFirst();
assertEquals(name, nsName.getName());
assertEquals(nsId.getId(), nsName.getNamespaceId().getId());
if (!parentName.isPresent()) {
Expand Down
Loading

0 comments on commit e6452e3

Please sign in to comment.