Skip to content

Commit fd6c151

Browse files
neutralleiterneutralleiter
committed
Adjust test cases and fix #134 
1 parent 0c820e5 commit fd6c151

20 files changed

Lines changed: 140 additions & 59 deletions

‎core/src/main/java/eu/bittrade/libs/steemj/base/models/operations/AbstractAccountCreateOperation.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import eu.bittrade.libs.steemj.base.models.Asset;
1010
import eu.bittrade.libs.steemj.base.models.Authority;
1111
import eu.bittrade.libs.steemj.base.models.PublicKey;
12-
import eu.bittrade.libs.steemj.enums.AssetSymbolType;
12+
import eu.bittrade.libs.steemj.configuration.SteemJConfig;
1313
import eu.bittrade.libs.steemj.enums.PrivateKeyType;
1414
import eu.bittrade.libs.steemj.enums.ValidationType;
1515
import eu.bittrade.libs.steemj.interfaces.SignatureObject;
@@ -216,7 +216,7 @@ public void validate(ValidationType validationType) {
216216
super.validate(validationType);
217217

218218
if (!ValidationType.SKIP_ASSET_VALIDATION.equals(validationType)) {
219-
if (!fee.getSymbol().equals(AssetSymbolType.STEEM)) {
219+
if (!fee.getSymbol().equals(SteemJConfig.getInstance().getTokenSymbol())) {
220220
throw new InvalidParameterException("The fee must be paid in STEEM.");
221221
} else if (fee.getAmount() < 0) {
222222
throw new InvalidParameterException("The fee must be a postive amount.");

‎core/src/main/java/eu/bittrade/libs/steemj/base/models/operations/AccountCreateWithDelegationOperation.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import eu.bittrade.libs.steemj.base.models.Authority;
1717
import eu.bittrade.libs.steemj.base.models.FutureExtensions;
1818
import eu.bittrade.libs.steemj.base.models.PublicKey;
19-
import eu.bittrade.libs.steemj.enums.AssetSymbolType;
19+
import eu.bittrade.libs.steemj.configuration.SteemJConfig;
2020
import eu.bittrade.libs.steemj.enums.OperationType;
2121
import eu.bittrade.libs.steemj.enums.ValidationType;
2222
import eu.bittrade.libs.steemj.exceptions.SteemInvalidTransactionException;
@@ -183,7 +183,7 @@ public void validate(ValidationType validationType) {
183183
super.validate(validationType);
184184

185185
if (!ValidationType.SKIP_ASSET_VALIDATION.equals(validationType)) {
186-
if (!delegation.getSymbol().equals(AssetSymbolType.VESTS)) {
186+
if (!delegation.getSymbol().equals(SteemJConfig.getInstance().getVestsSymbol())) {
187187
throw new InvalidParameterException("The delegation must have the symbol type VESTS.");
188188
} else if (delegation.getAmount() < 0) {
189189
throw new InvalidParameterException("The delegation must be a postive amount.");

‎core/src/main/java/eu/bittrade/libs/steemj/base/models/operations/ClaimRewardBalanceOperation.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
import eu.bittrade.libs.steemj.base.models.AccountName;
1515
import eu.bittrade.libs.steemj.base.models.Asset;
16-
import eu.bittrade.libs.steemj.enums.AssetSymbolType;
16+
import eu.bittrade.libs.steemj.configuration.SteemJConfig;
1717
import eu.bittrade.libs.steemj.enums.OperationType;
1818
import eu.bittrade.libs.steemj.enums.PrivateKeyType;
1919
import eu.bittrade.libs.steemj.enums.ValidationType;
@@ -216,15 +216,15 @@ public void validate(ValidationType validationType) {
216216
}
217217

218218
if (!ValidationType.SKIP_ASSET_VALIDATION.equals(validationType)) {
219-
if (!rewardSbd.getSymbol().equals(AssetSymbolType.SBD)) {
219+
if (!rewardSbd.getSymbol().equals(SteemJConfig.getInstance().getDollarSymbol())) {
220220
throw new InvalidParameterException("The SBD reward must be of symbol type SBD.");
221221
} else if (rewardSbd.getAmount() < 0) {
222222
throw new InvalidParameterException("Cannot claim a negative SBD amount");
223-
} else if (!rewardVests.getSymbol().equals(AssetSymbolType.VESTS)) {
223+
} else if (!rewardVests.getSymbol().equals(SteemJConfig.getInstance().getVestsSymbol())) {
224224
throw new InvalidParameterException("The VESTS reward must be of symbol type VESTS.");
225225
} else if (rewardVests.getAmount() < 0) {
226226
throw new InvalidParameterException("Cannot claim a negative VESTS amount");
227-
} else if (!rewardSteem.getSymbol().equals(AssetSymbolType.STEEM)) {
227+
} else if (!rewardSteem.getSymbol().equals(SteemJConfig.getInstance().getTokenSymbol())) {
228228
throw new InvalidParameterException("The STEEM reward must be of symbol type STEEM.");
229229
} else if (rewardSteem.getAmount() < 0) {
230230
throw new InvalidParameterException("Cannot claim a negative STEEM amount");

‎core/src/main/java/eu/bittrade/libs/steemj/base/models/operations/CommentOptionsOperation.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import eu.bittrade.libs.steemj.base.models.Asset;
1717
import eu.bittrade.libs.steemj.base.models.CommentOptionsExtension;
1818
import eu.bittrade.libs.steemj.base.models.Permlink;
19-
import eu.bittrade.libs.steemj.enums.AssetSymbolType;
19+
import eu.bittrade.libs.steemj.configuration.SteemJConfig;
2020
import eu.bittrade.libs.steemj.enums.OperationType;
2121
import eu.bittrade.libs.steemj.enums.PrivateKeyType;
2222
import eu.bittrade.libs.steemj.enums.ValidationType;
@@ -125,7 +125,8 @@ public CommentOptionsOperation(@JsonProperty("author") AccountName author,
125125
*/
126126
public CommentOptionsOperation(AccountName author, Permlink permlink, short percentSteemDollars,
127127
List<CommentOptionsExtension> extensions) {
128-
this(author, permlink, new Asset(1000000000, AssetSymbolType.SBD), percentSteemDollars, true, true, extensions);
128+
this(author, permlink, new Asset(1000000000, SteemJConfig.getInstance().getDollarSymbol()), percentSteemDollars,
129+
true, true, extensions);
129130
}
130131

131132
/**
@@ -381,7 +382,7 @@ public Map<SignatureObject, PrivateKeyType> getRequiredAuthorities(
381382
public void validate(ValidationType validationType) {
382383
if (!ValidationType.SKIP_VALIDATION.equals(validationType)) {
383384
if (!ValidationType.SKIP_ASSET_VALIDATION.equals(validationType)) {
384-
if (!maxAcceptedPayout.getSymbol().equals(AssetSymbolType.SBD)) {
385+
if (!maxAcceptedPayout.getSymbol().equals(SteemJConfig.getInstance().getDollarSymbol())) {
385386
throw new InvalidParameterException("The maximal accepted payout must be in SBD.");
386387
} else if (maxAcceptedPayout.getAmount() < 0) {
387388
throw new InvalidParameterException("Cannot accept less than 0 payout.");

‎core/src/main/java/eu/bittrade/libs/steemj/base/models/operations/ConvertOperation.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
import eu.bittrade.libs.steemj.base.models.AccountName;
1414
import eu.bittrade.libs.steemj.base.models.Asset;
15-
import eu.bittrade.libs.steemj.enums.AssetSymbolType;
15+
import eu.bittrade.libs.steemj.configuration.SteemJConfig;
1616
import eu.bittrade.libs.steemj.enums.OperationType;
1717
import eu.bittrade.libs.steemj.enums.PrivateKeyType;
1818
import eu.bittrade.libs.steemj.enums.ValidationType;
@@ -171,7 +171,7 @@ public Map<SignatureObject, PrivateKeyType> getRequiredAuthorities(
171171
public void validate(ValidationType validationType) {
172172
if (!ValidationType.SKIP_VALIDATION.equals(validationType)
173173
&& !ValidationType.SKIP_ASSET_VALIDATION.equals(validationType)) {
174-
if (!amount.getSymbol().equals(AssetSymbolType.SBD)) {
174+
if (!amount.getSymbol().equals(SteemJConfig.getInstance().getDollarSymbol())) {
175175
// Only allow conversion from SBD to STEEM, allowing the
176176
// opposite can enable traders to abuse market fluxuations
177177
// through converting large quantities without moving the price.

‎core/src/main/java/eu/bittrade/libs/steemj/base/models/operations/DelegateVestingSharesOperation.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
import eu.bittrade.libs.steemj.base.models.AccountName;
1414
import eu.bittrade.libs.steemj.base.models.Asset;
15-
import eu.bittrade.libs.steemj.enums.AssetSymbolType;
15+
import eu.bittrade.libs.steemj.configuration.SteemJConfig;
1616
import eu.bittrade.libs.steemj.enums.OperationType;
1717
import eu.bittrade.libs.steemj.enums.PrivateKeyType;
1818
import eu.bittrade.libs.steemj.enums.ValidationType;
@@ -165,7 +165,7 @@ public Map<SignatureObject, PrivateKeyType> getRequiredAuthorities(
165165
public void validate(ValidationType validationType) {
166166
if (!ValidationType.SKIP_VALIDATION.equals(validationType)) {
167167
if (!ValidationType.SKIP_ASSET_VALIDATION.equals(validationType)) {
168-
if (!vestingShares.getSymbol().equals(AssetSymbolType.VESTS)) {
168+
if (!vestingShares.getSymbol().equals(SteemJConfig.getInstance().getVestsSymbol())) {
169169
throw new InvalidParameterException("Can only delegate VESTS.");
170170
} else if (vestingShares.getAmount() <= 0) {
171171
throw new InvalidParameterException("Can't delegate a negative amount of VESTS.");

‎core/src/main/java/eu/bittrade/libs/steemj/base/models/operations/EscrowReleaseOperation.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
import eu.bittrade.libs.steemj.base.models.AccountName;
1414
import eu.bittrade.libs.steemj.base.models.Asset;
15-
import eu.bittrade.libs.steemj.enums.AssetSymbolType;
15+
import eu.bittrade.libs.steemj.configuration.SteemJConfig;
1616
import eu.bittrade.libs.steemj.enums.OperationType;
1717
import eu.bittrade.libs.steemj.enums.PrivateKeyType;
1818
import eu.bittrade.libs.steemj.enums.ValidationType;
@@ -94,8 +94,8 @@ public EscrowReleaseOperation(@JsonProperty("from") AccountName from, @JsonPrope
9494
*/
9595
public EscrowReleaseOperation(AccountName from, AccountName to, AccountName agent, long escrowId, AccountName who,
9696
AccountName receiver) {
97-
this(from, to, agent, escrowId, who, receiver, new Asset(0, AssetSymbolType.SBD),
98-
new Asset(0, AssetSymbolType.STEEM));
97+
this(from, to, agent, escrowId, who, receiver, new Asset(0, SteemJConfig.getInstance().getDollarSymbol()),
98+
new Asset(0, SteemJConfig.getInstance().getTokenSymbol()));
9999
}
100100

101101
/**
@@ -289,11 +289,11 @@ public void validate(ValidationType validationType) {
289289
if (!ValidationType.SKIP_ASSET_VALIDATION.equals(validationType)) {
290290
if (steemAmount.getAmount() < 0) {
291291
throw new InvalidParameterException("The steem amount cannot be negative.");
292-
} else if (!steemAmount.getSymbol().equals(AssetSymbolType.STEEM)) {
292+
} else if (!steemAmount.getSymbol().equals(SteemJConfig.getInstance().getTokenSymbol())) {
293293
throw new InvalidParameterException("The steem amount must contain STEEM.");
294294
} else if (sbdAmount.getAmount() < 0) {
295295
throw new InvalidParameterException("The sbd amount cannot be negative.");
296-
} else if (!sbdAmount.getSymbol().equals(AssetSymbolType.SBD)) {
296+
} else if (!sbdAmount.getSymbol().equals(SteemJConfig.getInstance().getDollarSymbol())) {
297297
throw new InvalidParameterException("The sbd amount must contain SBD.");
298298
} else if (sbdAmount.getAmount() + steemAmount.getAmount() < 0) {
299299
throw new InvalidParameterException("An escrow must release a non-zero amount.");

‎core/src/main/java/eu/bittrade/libs/steemj/base/models/operations/EscrowTransferOperation.java‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import eu.bittrade.libs.steemj.base.models.AccountName;
1313
import eu.bittrade.libs.steemj.base.models.Asset;
1414
import eu.bittrade.libs.steemj.base.models.TimePointSec;
15-
import eu.bittrade.libs.steemj.enums.AssetSymbolType;
15+
import eu.bittrade.libs.steemj.configuration.SteemJConfig;
1616
import eu.bittrade.libs.steemj.enums.OperationType;
1717
import eu.bittrade.libs.steemj.enums.ValidationType;
1818
import eu.bittrade.libs.steemj.exceptions.SteemInvalidTransactionException;
@@ -151,8 +151,9 @@ public EscrowTransferOperation(@JsonProperty("from") AccountName from, @JsonProp
151151
*/
152152
public EscrowTransferOperation(AccountName from, AccountName to, AccountName agent, long escrowId, Asset fee,
153153
TimePointSec ratificationDeadlineDate, TimePointSec escrowExpirationDate, String jsonMeta) {
154-
this(from, to, agent, escrowId, new Asset(0, AssetSymbolType.SBD), new Asset(0, AssetSymbolType.STEEM), fee,
155-
ratificationDeadlineDate, escrowExpirationDate, jsonMeta);
154+
this(from, to, agent, escrowId, new Asset(0, SteemJConfig.getInstance().getDollarSymbol()),
155+
new Asset(0, SteemJConfig.getInstance().getTokenSymbol()), fee, ratificationDeadlineDate,
156+
escrowExpirationDate, jsonMeta);
156157
}
157158

158159
/**
@@ -411,12 +412,12 @@ public void validate(ValidationType validationType) {
411412
throw new InvalidParameterException("The steem amount cannot be negative.");
412413
} else if (sbdAmount.getAmount() + steemAmount.getAmount() < 0) {
413414
throw new InvalidParameterException("An escrow must release a non-zero amount.");
414-
} else if (!fee.getSymbol().equals(AssetSymbolType.STEEM)
415-
&& !fee.getSymbol().equals(AssetSymbolType.SBD)) {
415+
} else if (!fee.getSymbol().equals(SteemJConfig.getInstance().getTokenSymbol())
416+
&& !fee.getSymbol().equals(SteemJConfig.getInstance().getDollarSymbol())) {
416417
throw new InvalidParameterException("The fee must be STEEM or SBD.");
417-
} else if (!sbdAmount.getSymbol().equals(AssetSymbolType.SBD)) {
418+
} else if (!sbdAmount.getSymbol().equals(SteemJConfig.getInstance().getDollarSymbol())) {
418419
throw new InvalidParameterException("The sbd amount must contain SBD.");
419-
} else if (!steemAmount.getSymbol().equals(AssetSymbolType.STEEM)) {
420+
} else if (!steemAmount.getSymbol().equals(SteemJConfig.getInstance().getTokenSymbol())) {
420421
throw new InvalidParameterException("The steem amount must contain STEEM.");
421422
}
422423
}

‎core/src/main/java/eu/bittrade/libs/steemj/base/models/operations/FeedPublishOperation.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
import eu.bittrade.libs.steemj.base.models.AccountName;
1414
import eu.bittrade.libs.steemj.base.models.Price;
15-
import eu.bittrade.libs.steemj.enums.AssetSymbolType;
15+
import eu.bittrade.libs.steemj.configuration.SteemJConfig;
1616
import eu.bittrade.libs.steemj.enums.OperationType;
1717
import eu.bittrade.libs.steemj.enums.PrivateKeyType;
1818
import eu.bittrade.libs.steemj.enums.ValidationType;
@@ -129,10 +129,11 @@ public Map<SignatureObject, PrivateKeyType> getRequiredAuthorities(
129129
public void validate(ValidationType validationType) {
130130
if (!ValidationType.SKIP_VALIDATION.equals(validationType)
131131
&& (!ValidationType.SKIP_ASSET_VALIDATION.equals(validationType))
132-
&& (!(exchangeRate.getBase().getSymbol().equals(AssetSymbolType.STEEM)
133-
&& exchangeRate.getQuote().getSymbol().equals(AssetSymbolType.SBD)
134-
|| exchangeRate.getBase().getSymbol().equals(AssetSymbolType.SBD)
135-
&& exchangeRate.getQuote().getSymbol().equals(AssetSymbolType.STEEM)))) {
132+
&& (!(exchangeRate.getBase().getSymbol().equals(SteemJConfig.getInstance().getTokenSymbol())
133+
&& exchangeRate.getQuote().getSymbol().equals(SteemJConfig.getInstance().getDollarSymbol())
134+
|| exchangeRate.getBase().getSymbol().equals(SteemJConfig.getInstance().getDollarSymbol())
135+
&& exchangeRate.getQuote().getSymbol()
136+
.equals(SteemJConfig.getInstance().getTokenSymbol())))) {
136137
throw new InvalidParameterException("The Price feed must be a STEEM/SBD price.");
137138
}
138139
}

‎core/src/main/java/eu/bittrade/libs/steemj/base/models/operations/LimitOrderCreate2Operation.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import eu.bittrade.libs.steemj.base.models.Asset;
1515
import eu.bittrade.libs.steemj.base.models.Price;
1616
import eu.bittrade.libs.steemj.base.models.TimePointSec;
17-
import eu.bittrade.libs.steemj.enums.AssetSymbolType;
17+
import eu.bittrade.libs.steemj.configuration.SteemJConfig;
1818
import eu.bittrade.libs.steemj.enums.OperationType;
1919
import eu.bittrade.libs.steemj.enums.ValidationType;
2020
import eu.bittrade.libs.steemj.exceptions.SteemInvalidTransactionException;
@@ -299,10 +299,11 @@ public void validate(ValidationType validationType) {
299299
throw new InvalidParameterException("The sell asset must be the base of the price.");
300300
} else if (exchangeRate.multiply(amountToSell).getAmount() <= 0) {
301301
throw new InvalidParameterException("The Amount to sell cannot round to 0 when traded.");
302-
} else if (!((amountToSell.getSymbol().equals(AssetSymbolType.STEEM)
303-
&& this.getExchangeRate().getQuote().getSymbol().equals(AssetSymbolType.SBD))
304-
|| (amountToSell.getSymbol().equals(AssetSymbolType.SBD)
305-
&& this.getExchangeRate().getQuote().getSymbol().equals(AssetSymbolType.STEEM)))) {
302+
} else if (!((amountToSell.getSymbol().equals(SteemJConfig.getInstance().getTokenSymbol()) && this
303+
.getExchangeRate().getQuote().getSymbol().equals(SteemJConfig.getInstance().getDollarSymbol()))
304+
|| (amountToSell.getSymbol().equals(SteemJConfig.getInstance().getDollarSymbol())
305+
&& this.getExchangeRate().getQuote().getSymbol()
306+
.equals(SteemJConfig.getInstance().getTokenSymbol())))) {
306307
throw new InvalidParameterException("Limit order must be for the STEEM:SBD market.");
307308
}
308309
}

0 commit comments

Comments
 (0)