Skip to content

Commit 2417a75

Browse files
tonowietonowie
authored
Merge pull request #131 from proximax-storage/bug/130-deadlinebackport
issue #130 - remove use of DeadlineBP
2 parents bfb724d + 06aa9e0 commit 2417a75

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

‎src/main/java/io/proximax/sdk/infrastructure/TransactionMapping.java

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ public TransferTransaction apply(JsonObject input) {
161161
// retrieve transaction data from transaction field
162162
JsonObject transaction = input.getAsJsonObject("transaction");
163163
// deadline
164-
DeadlineBP deadline = new DeadlineBP(GsonUtils.getBigInteger(transaction.getAsJsonArray("deadline")));
164+
DeadlineRaw deadline = new DeadlineRaw(GsonUtils.getBigInteger(transaction.getAsJsonArray("deadline")));
165165
// mosaics
166166
List<Mosaic> mosaics;
167167
if (transaction.getAsJsonArray("mosaics") != null) {
@@ -212,7 +212,7 @@ public ModifyMetadataTransaction apply(JsonObject input) {
212212
// retrieve transaction data from transaction field
213213
JsonObject transaction = input.getAsJsonObject("transaction");
214214
// deadline
215-
DeadlineBP deadline = new DeadlineBP(GsonUtils.getBigInteger(transaction.getAsJsonArray("deadline")));
215+
DeadlineRaw deadline = new DeadlineRaw(GsonUtils.getBigInteger(transaction.getAsJsonArray("deadline")));
216216
// version
217217
JsonElement version = transaction.get("version");
218218
// transaction type
@@ -283,7 +283,7 @@ public ModifyAccountPropertyTransaction<?> apply(JsonObject input) {
283283
// retrieve transaction data from transaction field
284284
JsonObject transaction = input.getAsJsonObject("transaction");
285285
// deadline
286-
DeadlineBP deadline = new DeadlineBP(GsonUtils.getBigInteger(transaction.getAsJsonArray("deadline")));
286+
DeadlineRaw deadline = new DeadlineRaw(GsonUtils.getBigInteger(transaction.getAsJsonArray("deadline")));
287287
// version
288288
JsonElement version = transaction.get("version");
289289
// transaction type
@@ -382,7 +382,7 @@ public RegisterNamespaceTransaction apply(JsonObject input) {
382382
TransactionInfo transactionInfo = this.createTransactionInfo(input.getAsJsonObject("meta"));
383383
JsonObject transaction = input.getAsJsonObject("transaction");
384384
// retrieve fields
385-
DeadlineBP deadline = new DeadlineBP(GsonUtils.getBigInteger(transaction.getAsJsonArray("deadline")));
385+
DeadlineRaw deadline = new DeadlineRaw(GsonUtils.getBigInteger(transaction.getAsJsonArray("deadline")));
386386
NamespaceType namespaceType = NamespaceType.rawValueOf(transaction.get("namespaceType").getAsInt());
387387
NamespaceId namespaceId = new NamespaceId(GsonUtils.getBigInteger(transaction.getAsJsonArray("namespaceId")));
388388
Optional<BigInteger> namespaceDuration = namespaceType == NamespaceType.ROOT_NAMESPACE
@@ -412,7 +412,7 @@ public MosaicDefinitionTransaction apply(JsonObject input) {
412412
TransactionInfo transactionInfo = this.createTransactionInfo(input.getAsJsonObject("meta"));
413413
JsonObject transaction = input.getAsJsonObject("transaction");
414414
// load data fields
415-
DeadlineBP deadline = new DeadlineBP(GsonUtils.getBigInteger(transaction.getAsJsonArray("deadline")));
415+
DeadlineRaw deadline = new DeadlineRaw(GsonUtils.getBigInteger(transaction.getAsJsonArray("deadline")));
416416
// construct properties
417417
JsonElement version = transaction.get("version");
418418
// return instance of mosaic definition transaction
@@ -477,7 +477,7 @@ public AliasTransaction apply(JsonObject input) {
477477
TransactionInfo transactionInfo = this.createTransactionInfo(input.getAsJsonObject("meta"));
478478
JsonObject transaction = input.getAsJsonObject("transaction");
479479
// load data fields
480-
DeadlineBP deadline = new DeadlineBP(GsonUtils.getBigInteger(transaction.getAsJsonArray("deadline")));
480+
DeadlineRaw deadline = new DeadlineRaw(GsonUtils.getBigInteger(transaction.getAsJsonArray("deadline")));
481481
JsonElement version = transaction.get("version");
482482
// return instance of mosaic alias definition transaction
483483
return new AliasTransaction(EntityType.MOSAIC_ALIAS, extractNetworkType(version),
@@ -502,7 +502,7 @@ public AliasTransaction apply(JsonObject input) {
502502
TransactionInfo transactionInfo = this.createTransactionInfo(input.getAsJsonObject("meta"));
503503
JsonObject transaction = input.getAsJsonObject("transaction");
504504
// load data fields
505-
DeadlineBP deadline = new DeadlineBP(GsonUtils.getBigInteger(transaction.getAsJsonArray("deadline")));
505+
DeadlineRaw deadline = new DeadlineRaw(GsonUtils.getBigInteger(transaction.getAsJsonArray("deadline")));
506506
JsonElement version = transaction.get("version");
507507
// return instance of mosaic alias definition transaction
508508
return new AliasTransaction(EntityType.ADDRESS_ALIAS, extractNetworkType(version),
@@ -523,7 +523,7 @@ public MosaicSupplyChangeTransaction apply(JsonObject input) {
523523
TransactionInfo transactionInfo = this.createTransactionInfo(input.getAsJsonObject("meta"));
524524

525525
JsonObject transaction = input.getAsJsonObject("transaction");
526-
DeadlineBP deadline = new DeadlineBP(GsonUtils.getBigInteger(transaction.getAsJsonArray("deadline")));
526+
DeadlineRaw deadline = new DeadlineRaw(GsonUtils.getBigInteger(transaction.getAsJsonArray("deadline")));
527527

528528
return new MosaicSupplyChangeTransaction(extractNetworkType(transaction.get("version")),
529529
extractTransactionVersion(transaction.get("version")), deadline, extractFee(transaction),
@@ -543,7 +543,7 @@ public ModifyMultisigAccountTransaction apply(JsonObject input) {
543543
TransactionInfo transactionInfo = this.createTransactionInfo(input.getAsJsonObject("meta"));
544544

545545
JsonObject transaction = input.getAsJsonObject("transaction");
546-
DeadlineBP deadline = new DeadlineBP(GsonUtils.getBigInteger(transaction.getAsJsonArray("deadline")));
546+
DeadlineRaw deadline = new DeadlineRaw(GsonUtils.getBigInteger(transaction.getAsJsonArray("deadline")));
547547
NetworkType networkType = extractNetworkType(transaction.get("version"));
548548

549549
List<MultisigCosignatoryModification> modifications = transaction.has("modifications")
@@ -575,7 +575,7 @@ public ModifyContractTransaction apply(JsonObject input) {
575575
TransactionInfo transactionInfo = this.createTransactionInfo(input.getAsJsonObject("meta"));
576576

577577
JsonObject transaction = input.getAsJsonObject("transaction");
578-
DeadlineBP deadline = new DeadlineBP(GsonUtils.getBigInteger(transaction.getAsJsonArray("deadline")));
578+
DeadlineRaw deadline = new DeadlineRaw(GsonUtils.getBigInteger(transaction.getAsJsonArray("deadline")));
579579
NetworkType networkType = extractNetworkType(transaction.get("version"));
580580

581581
return new ModifyContractTransaction(networkType, extractTransactionVersion(transaction.get("version")), deadline,
@@ -619,7 +619,7 @@ public AggregateTransaction apply(JsonObject input) {
619619
TransactionInfo transactionInfo = this.createTransactionInfo(input.getAsJsonObject("meta"));
620620

621621
JsonObject transaction = input.getAsJsonObject("transaction");
622-
DeadlineBP deadline = new DeadlineBP(GsonUtils.getBigInteger(transaction.getAsJsonArray("deadline")));
622+
DeadlineRaw deadline = new DeadlineRaw(GsonUtils.getBigInteger(transaction.getAsJsonArray("deadline")));
623623
NetworkType networkType = extractNetworkType(transaction.get("version"));
624624

625625
List<Transaction> transactions = new ArrayList<>();
@@ -680,7 +680,7 @@ public LockFundsTransaction apply(JsonObject input) {
680680
TransactionInfo transactionInfo = this.createTransactionInfo(input.getAsJsonObject("meta"));
681681

682682
JsonObject transaction = input.getAsJsonObject("transaction");
683-
DeadlineBP deadline = new DeadlineBP(GsonUtils.getBigInteger(transaction.getAsJsonArray("deadline")));
683+
DeadlineRaw deadline = new DeadlineRaw(GsonUtils.getBigInteger(transaction.getAsJsonArray("deadline")));
684684
NetworkType networkType = extractNetworkType(transaction.get("version"));
685685
Mosaic mosaic;
686686
if (transaction.has("mosaicId")) {
@@ -711,7 +711,7 @@ public SecretLockTransaction apply(JsonObject input) {
711711
TransactionInfo transactionInfo = this.createTransactionInfo(input.getAsJsonObject("meta"));
712712

713713
JsonObject transaction = input.getAsJsonObject("transaction");
714-
DeadlineBP deadline = new DeadlineBP(GsonUtils.getBigInteger(transaction.getAsJsonArray("deadline")));
714+
DeadlineRaw deadline = new DeadlineRaw(GsonUtils.getBigInteger(transaction.getAsJsonArray("deadline")));
715715
NetworkType networkType = extractNetworkType(transaction.get("version"));
716716
Mosaic mosaic;
717717
if (transaction.has("mosaicId")) {
@@ -738,7 +738,7 @@ public SecretProofTransaction apply(JsonObject input) {
738738
TransactionInfo transactionInfo = this.createTransactionInfo(input.getAsJsonObject("meta"));
739739

740740
JsonObject transaction = input.getAsJsonObject("transaction");
741-
DeadlineBP deadline = new DeadlineBP(GsonUtils.getBigInteger(transaction.getAsJsonArray("deadline")));
741+
DeadlineRaw deadline = new DeadlineRaw(GsonUtils.getBigInteger(transaction.getAsJsonArray("deadline")));
742742
NetworkType networkType = extractNetworkType(transaction.get("version"));
743743

744744
return new SecretProofTransaction(networkType, extractTransactionVersion(transaction.get("version")), deadline,
@@ -761,7 +761,7 @@ public AccountLinkTransaction apply(JsonObject input) {
761761
TransactionInfo transactionInfo = this.createTransactionInfo(input.getAsJsonObject("meta"));
762762

763763
JsonObject transaction = input.getAsJsonObject("transaction");
764-
DeadlineBP deadline = new DeadlineBP(GsonUtils.getBigInteger(transaction.getAsJsonArray("deadline")));
764+
DeadlineRaw deadline = new DeadlineRaw(GsonUtils.getBigInteger(transaction.getAsJsonArray("deadline")));
765765
NetworkType networkType = extractNetworkType(transaction.get("version"));
766766
return new AccountLinkTransaction(
767767
networkType,
@@ -800,7 +800,7 @@ public BlockchainUpgradeTransaction apply(JsonObject input) {
800800
TransactionInfo transactionInfo = this.createTransactionInfo(input.getAsJsonObject("meta"));
801801

802802
JsonObject transaction = input.getAsJsonObject("transaction");
803-
DeadlineBP deadline = new DeadlineBP(GsonUtils.getBigInteger(transaction.getAsJsonArray("deadline")));
803+
DeadlineRaw deadline = new DeadlineRaw(GsonUtils.getBigInteger(transaction.getAsJsonArray("deadline")));
804804
NetworkType networkType = extractNetworkType(transaction.get("version"));
805805
return new BlockchainUpgradeTransaction(
806806
networkType,
@@ -825,7 +825,7 @@ public BlockchainConfigTransaction apply(JsonObject input) {
825825
TransactionInfo transactionInfo = this.createTransactionInfo(input.getAsJsonObject("meta"));
826826

827827
JsonObject transaction = input.getAsJsonObject("transaction");
828-
DeadlineBP deadline = new DeadlineBP(GsonUtils.getBigInteger(transaction.getAsJsonArray("deadline")));
828+
DeadlineRaw deadline = new DeadlineRaw(GsonUtils.getBigInteger(transaction.getAsJsonArray("deadline")));
829829
NetworkType networkType = extractNetworkType(transaction.get("version"));
830830
return new BlockchainConfigTransaction(
831831
networkType,

0 commit comments

Comments
 (0)