Skip to content

Commit bfb724d

Browse files
tonowietonowie
authored
Merge pull request #129 from proximax-storage/feature/126-checked-builders
Feature/126 checked builders
2 parents a8bc00a + 5ece203 commit bfb724d

33 files changed

+516
-149
lines changed

‎CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# CHANGELOG
22

3+
## 0.6.1
4+
5+
Minor release with new features and fixes
6+
* enhanced transaction builder API
7+
38
## 0.6.0 Security audit
49

510
Breaking changes introduced by the security audit

‎gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# repository group
22
group=io.proximax
33
# current version
4-
version=0.6.0-SNAPSHOT
4+
version=0.6.1-SNAPSHOT

‎src/e2e/java/io/proximax/sdk/E2EAccountTest.java

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
import io.proximax.sdk.model.account.props.AccountProperties;
4141
import io.proximax.sdk.model.account.props.AccountProperty;
4242
import io.proximax.sdk.model.account.props.AccountPropertyModification;
43-
import io.proximax.sdk.model.account.props.AccountPropertyModificationType;
4443
import io.proximax.sdk.model.account.props.AccountPropertyType;
4544
import io.proximax.sdk.model.mosaic.MosaicId;
4645
import io.proximax.sdk.model.mosaic.NetworkCurrencyMosaic;
@@ -77,10 +76,7 @@ void addBlockAccountProperty() {
7776
logger.info("going to block {} by {}", blocked.getPublicAccount(), acct.getPublicAccount());
7877

7978
ModifyAccountPropertyTransaction<Address> trans = transact.accountPropAddress()
80-
.propertyType(AccountPropertyType.BLOCK_ADDRESS)
81-
.modifications(Arrays
82-
.asList(new AccountPropertyModification<>(AccountPropertyModificationType.ADD, blocked.getAddress())))
83-
.build();
79+
.blocked(Arrays.asList(AccountPropertyModification.add(blocked.getAddress()))).build();
8480
// announce the transaction
8581
transactionHttp.announce(trans.signWith(acct, api.getNetworkGenerationHash())).blockingFirst();
8682
logger.info("Waiting for confirmation");
@@ -104,8 +100,7 @@ void addAllowMosaicProperty() {
104100
UInt64Id allowedMosaic = NetworkCurrencyMosaic.ID;
105101
logger.info("going to allow {} by {}", allowedMosaic, acct.getPublicAccount());
106102
ModifyAccountPropertyTransaction<UInt64Id> trans = transact.accountPropMosaic()
107-
.propertyType(AccountPropertyType.ALLOW_MOSAIC)
108-
.modifications(Arrays.asList(AccountPropertyModification.add(allowedMosaic))).build();
103+
.allowed(Arrays.asList(AccountPropertyModification.add(allowedMosaic))).build();
109104
// announce the transaction
110105
transactionHttp.announce(trans.signWith(acct, api.getNetworkGenerationHash())).blockingFirst();
111106
logger.info("Waiting for confirmation");
@@ -129,8 +124,7 @@ void addAllowEntityTypeProperty() {
129124
EntityType allowedTransType = EntityType.ACCOUNT_PROPERTIES_ENTITY_TYPE;
130125
logger.info("going to allow {} by {}", allowedTransType, acct.getPublicAccount());
131126
ModifyAccountPropertyTransaction<EntityType> trans = transact.accountPropEntityType()
132-
.propertyType(AccountPropertyType.ALLOW_TRANSACTION)
133-
.modifications(Arrays.asList(AccountPropertyModification.add(allowedTransType))).build();
127+
.allowed(Arrays.asList(AccountPropertyModification.add(allowedTransType))).build();
134128
// announce the transaction
135129
transactionHttp.announce(trans.signWith(acct, api.getNetworkGenerationHash())).blockingFirst();
136130
logger.info("Waiting for confirmation");
@@ -293,8 +287,8 @@ void transactionsWithPagination() throws ExecutionException, InterruptedExceptio
293287
void incomingTransactions() throws ExecutionException, InterruptedException {
294288
List<Transaction> transactions = accountHttp.incomingTransactions(simpleAccount.getPublicAccount()).toFuture()
295289
.get();
296-
List<Transaction> transactionsByAddr = accountHttp.incomingTransactions(simpleAccount.getPublicAccount().getAddress()).toFuture()
297-
.get();
290+
List<Transaction> transactionsByAddr = accountHttp
291+
.incomingTransactions(simpleAccount.getPublicAccount().getAddress()).toFuture().get();
298292

299293
assertEquals(1, transactions.size());
300294
assertEquals(1, transactionsByAddr.size());

‎src/e2e/java/io/proximax/sdk/E2EAliasTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,9 @@ void test01PrepareData() {
118118
sleepForAWhile();
119119
// create mosaic
120120
logger.info("Creating new mosaic");
121-
SignedTransaction mdt = transact.mosaicDefinition().nonce(mosaicNonce).mosaicId(mosaicId)
122-
.mosaicProperties(new MosaicProperties(true, true, 6, Optional.of(BigInteger.valueOf(200)))).build()
123-
.signWith(seedAccount, api.getNetworkGenerationHash());
121+
SignedTransaction mdt = transact.mosaicDefinition()
122+
.init(mosaicNonce, mosaicId, new MosaicProperties(true, true, 6, Optional.of(BigInteger.valueOf(200))))
123+
.build().signWith(seedAccount, api.getNetworkGenerationHash());
124124
Observable<Transaction> confirmation = listener.confirmed(seedAccount.getAddress()).timeout(getTimeoutSeconds(),
125125
TimeUnit.SECONDS);
126126
sleepForAWhile();

‎src/e2e/java/io/proximax/sdk/E2EContractTest.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,7 @@ void prepare() {
8383
void test02CreateContract() {
8484
logger.info("Creating contract");
8585
// prepare transaction
86-
ModifyContractTransaction trans = transact.modifyContract().durationDelta(BigInteger.valueOf(100l))
87-
.contentHash(contentHash)
86+
ModifyContractTransaction trans = transact.contract().init(contentHash, BigInteger.valueOf(100l))
8887
.customersModifications(MultisigCosignatoryModification.add(customer.getPublicAccount()))
8988
.executorsModifications(MultisigCosignatoryModification.add(executor1.getPublicAccount()),
9089
MultisigCosignatoryModification.add(executor2.getPublicAccount()))
@@ -121,7 +120,7 @@ void test02CreateContract() {
121120
void test03ChangeExistingContract() {
122121
logger.info("Changing contract");
123122
// prepare transaction - add one block to duration, move executor2 to verifiers
124-
ModifyContractTransaction trans = transact.modifyContract().durationDelta(BigInteger.ONE).contentHash(contentHash)
123+
ModifyContractTransaction trans = transact.contract().durationDelta(BigInteger.ONE).contentHash(contentHash)
125124
.executorsModifications(MultisigCosignatoryModification.remove(executor2.getPublicAccount()))
126125
.verifiersModifications(MultisigCosignatoryModification.add(executor2.getPublicAccount())).build();
127126
// create aggregate transaction for the multisig

‎src/e2e/java/io/proximax/sdk/E2EMetadataTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ void add02MetadataToMosaic() {
8585
logger.info("Creating new mosaic {}", id);
8686
signup(seedAccount.getAddress());
8787
// create mosaic
88-
SignedTransaction mdt = transact.mosaicDefinition().nonce(nonce).mosaicId(id)
89-
.mosaicProperties(new MosaicProperties(true, true, 6, Optional.of(BigInteger.valueOf(20)))).build()
88+
SignedTransaction mdt = transact.mosaicDefinition()
89+
.init(nonce, id, new MosaicProperties(true, true, 6, Optional.of(BigInteger.valueOf(20)))).build()
9090
.signWith(seedAccount, api.getNetworkGenerationHash());
9191
Observable<Transaction> confirmation = listener.confirmed(seedAccount.getAddress()).timeout(getTimeoutSeconds(),
9292
TimeUnit.SECONDS);

‎src/e2e/java/io/proximax/sdk/E2EMosaicTest.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ void test00PrepareMosaicId() {
7474
@Test
7575
void test01CreateMosaic() {
7676
logger.info("Creating new mosaic");
77-
SignedTransaction mdt = transact.mosaicDefinition().nonce(nonce).mosaicId(id)
78-
.mosaicProperties(new MosaicProperties(true, true, 6, Optional.of(BigInteger.valueOf(20)))).build()
77+
SignedTransaction mdt = transact.mosaicDefinition()
78+
.init(nonce, id, new MosaicProperties(true, true, 6, Optional.of(BigInteger.valueOf(20)))).build()
7979
.signWith(seedAccount, api.getNetworkGenerationHash());
8080
Observable<Transaction> confirmation = listener.confirmed(seedAccount.getAddress()).timeout(getTimeoutSeconds(),
8181
TimeUnit.SECONDS);
@@ -95,7 +95,7 @@ void test01CreateMosaic() {
9595
@Test
9696
void test02ChangeSupply() {
9797
logger.info("Changing supply");
98-
SignedTransaction supplychange = transact.mosaicSupplyChange().increaseSupplyFor(id).delta(BigInteger.TEN).build()
98+
SignedTransaction supplychange = transact.mosaicSupplyChange().increase(id, BigInteger.TEN).build()
9999
.signWith(seedAccount, api.getNetworkGenerationHash());
100100
transactionHttp.announce(supplychange).blockingFirst();
101101
logger.info("Supply changed. {}",
@@ -110,7 +110,7 @@ void test02ChangeSupply() {
110110
@Test
111111
void test03DecreaseSupply() {
112112
logger.info("Changing supply");
113-
SignedTransaction supplychange = transact.mosaicSupplyChange().decreaseSupplyFor(id).delta(BigInteger.ONE).build()
113+
SignedTransaction supplychange = transact.mosaicSupplyChange().decrease(id, BigInteger.ONE).build()
114114
.signWith(seedAccount, api.getNetworkGenerationHash());
115115
transactionHttp.announce(supplychange).blockingFirst();
116116
logger.info("Supply changed. {}",
@@ -128,14 +128,14 @@ void test04AggregateMosaic() {
128128
MosaicNonce aNonce = MosaicNonce.createRandom();
129129
MosaicId aId = new MosaicId(aNonce, seedAccount.getPublicKey());
130130
// create mosaic
131-
MosaicDefinitionTransaction create = transact.mosaicDefinition().nonce(aNonce).mosaicId(aId)
132-
.mosaicProperties(new MosaicProperties(true, true, 6, Optional.of(BigInteger.valueOf(20)))).build();
131+
MosaicDefinitionTransaction create = transact.mosaicDefinition()
132+
.init(aNonce, aId, new MosaicProperties(true, true, 6, Optional.of(BigInteger.valueOf(20)))).build();
133133
// add supply of 10
134-
MosaicSupplyChangeTransaction increaseSupply = transact.mosaicSupplyChange().increaseSupplyFor(aId)
135-
.delta(BigInteger.TEN).build();
134+
MosaicSupplyChangeTransaction increaseSupply = transact.mosaicSupplyChange().increase(aId, BigInteger.TEN)
135+
.build();
136136
// remove supply of 1
137-
MosaicSupplyChangeTransaction decreaseSupply = transact.mosaicSupplyChange().decreaseSupplyFor(aId)
138-
.delta(BigInteger.ONE).build();
137+
MosaicSupplyChangeTransaction decreaseSupply = transact.mosaicSupplyChange().decrease(aId, BigInteger.ONE)
138+
.build();
139139
// create aggregate transaction
140140
AggregateTransaction aggregateTransaction = transact.aggregateComplete()
141141
.innerTransactions(create.toAggregate(seedAccount.getPublicAccount()),
@@ -161,8 +161,8 @@ void test05CreateMosaicWithoutDuration() {
161161
MosaicNonce aNonce = MosaicNonce.createRandom();
162162
MosaicId aId = new MosaicId(aNonce, seedAccount.getPublicKey());
163163
logger.info("Creating new mosaic {}", aId.getIdAsHex());
164-
SignedTransaction mdt = transact.mosaicDefinition().nonce(aNonce).mosaicId(aId)
165-
.mosaicProperties(new MosaicProperties(true, true, 6, Optional.empty())).build()
164+
SignedTransaction mdt = transact.mosaicDefinition()
165+
.init(aNonce, aId, new MosaicProperties(true, true, 6, Optional.empty())).build()
166166
.signWith(seedAccount, api.getNetworkGenerationHash());
167167
Observable<Transaction> confirmation = listener.confirmed(seedAccount.getAddress()).timeout(getTimeoutSeconds(),
168168
TimeUnit.SECONDS);

0 commit comments

Comments
 (0)