From 910b2d9059a3aadc60181d455f2baa55f341054c Mon Sep 17 00:00:00 2001 From: supaiku <1311798+supaiku0@users.noreply.github.com> Date: Tue, 11 Jun 2019 14:17:00 +0200 Subject: [PATCH 01/23] release: 0.1.4 (#47) --- CHANGELOG.md | 5 +++++ build.gradle | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a3de660..284dcbff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## Unreleased +## 0.1.4 - 2019-11-06 + +### Fixed +- Support 255 bytes vendor fields + ## 0.1.3 - 2019-25-04 ### Fixed diff --git a/build.gradle b/build.gradle index 9dc4649f..384d214d 100644 --- a/build.gradle +++ b/build.gradle @@ -46,7 +46,7 @@ uploadArchives { pom.project { groupId = 'org.arkecosystem' - version = '0.1.3' + version = '0.1.4' artifactId = 'crypto' name = 'java-crypto' @@ -79,7 +79,7 @@ uploadArchives { scm { connection = 'scm:git:git://github.com/ArkEcosystem/java-crypto.git' developerConnection = 'scm:git:ssh://github.com:ArkEcosystem/java-crypto.git' - url = 'https://github.com/ArkEcosystem/java-crypto/tree/0.1.2' + url = 'https://github.com/ArkEcosystem/java-crypto/tree/0.1.4' } } } From 1f449daf8a4f43cd0e97b8b2bc6054843cdd26a9 Mon Sep 17 00:00:00 2001 From: supaiku <1311798+supaiku0@users.noreply.github.com> Date: Tue, 9 Jul 2019 04:09:29 +0200 Subject: [PATCH 02/23] chore: bump dependencies (#49) --- build.gradle | 9 +++++---- .../org/arkecosystem/crypto/identities/Address.java | 2 +- .../crypto/transactions/Transaction.java | 13 +++++++++++-- .../java/org/arkecosystem/crypto/utils/Message.java | 7 ++++++- 4 files changed, 23 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 384d214d..c4fcfeca 100644 --- a/build.gradle +++ b/build.gradle @@ -94,12 +94,13 @@ if (project.hasProperty("signing.keyId")) { } dependencies { - compile group: 'org.bitcoinj', name: 'bitcoinj-core', version: '0.14.7' - compile group: 'com.madgag.spongycastle', name: 'core', version: '1.54.0.0' + compile group: 'org.bitcoinj', name: 'bitcoinj-core', version: '0.15.2' + compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.62' compile group: 'com.google.code.gson', name: 'gson', version: '2.8.0' + compile 'com.google.guava:guava:28.0-jre' - testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.1' - testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.3.1' + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.0' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.0' } test { diff --git a/src/main/java/org/arkecosystem/crypto/identities/Address.java b/src/main/java/org/arkecosystem/crypto/identities/Address.java index 1af9b998..adb2d3b6 100644 --- a/src/main/java/org/arkecosystem/crypto/identities/Address.java +++ b/src/main/java/org/arkecosystem/crypto/identities/Address.java @@ -5,7 +5,7 @@ import org.arkecosystem.crypto.encoding.Base58; import org.arkecosystem.crypto.encoding.Hex; import org.bitcoinj.core.ECKey; -import org.spongycastle.crypto.digests.RIPEMD160Digest; +import org.bouncycastle.crypto.digests.RIPEMD160Digest; public class Address { public static String fromPassphrase(String passphrase, Integer networkVersion) { diff --git a/src/main/java/org/arkecosystem/crypto/transactions/Transaction.java b/src/main/java/org/arkecosystem/crypto/transactions/Transaction.java index d4d5b758..ca80655c 100644 --- a/src/main/java/org/arkecosystem/crypto/transactions/Transaction.java +++ b/src/main/java/org/arkecosystem/crypto/transactions/Transaction.java @@ -7,6 +7,7 @@ import org.arkecosystem.crypto.identities.PrivateKey; import org.bitcoinj.core.ECKey; import org.bitcoinj.core.Sha256Hash; +import org.bitcoinj.core.SignatureDecodeException; import java.lang.reflect.Type; import java.nio.ByteBuffer; @@ -66,7 +67,11 @@ public boolean verify() { byte[] signature = Hex.decode(this.signature); byte[] bytes = toBytes(); - return ECKey.verify(Sha256Hash.hash(bytes), signature, keys.getPubKey()); + try { + return ECKey.verify(Sha256Hash.hash(bytes), signature, keys.getPubKey()); + } catch (SignatureDecodeException e) { + return false; + } } public boolean secondVerify(String secondPublicKey) { @@ -75,7 +80,11 @@ public boolean secondVerify(String secondPublicKey) { byte[] signature = Hex.decode(this.signSignature); byte[] bytes = toBytes(false); - return ECKey.verify(Sha256Hash.hash(bytes), signature, keys.getPubKey()); + try { + return ECKey.verify(Sha256Hash.hash(bytes), signature, keys.getPubKey()); + } catch (SignatureDecodeException e) { + return false; + } } public Transaction parseSignatures(String serialized, int startOffset) { diff --git a/src/main/java/org/arkecosystem/crypto/utils/Message.java b/src/main/java/org/arkecosystem/crypto/utils/Message.java index 744c86a7..bd638b4a 100644 --- a/src/main/java/org/arkecosystem/crypto/utils/Message.java +++ b/src/main/java/org/arkecosystem/crypto/utils/Message.java @@ -5,6 +5,7 @@ import org.arkecosystem.crypto.identities.PrivateKey; import org.bitcoinj.core.ECKey; import org.bitcoinj.core.Sha256Hash; +import org.bitcoinj.core.SignatureDecodeException; import java.util.HashMap; import java.util.Map; @@ -34,7 +35,11 @@ public boolean verify() { byte[] signature = Hex.decode(this.signature); byte[] messageBytes = Sha256Hash.hash(this.message.getBytes()); - return ECKey.verify(messageBytes, signature, keys.getPubKey()); + try { + return ECKey.verify(messageBytes, signature, keys.getPubKey()); + } catch (SignatureDecodeException e) { + return false; + } } public Map toMap() { From c6ae3c9888a60e1af395a88f5e6cb519b945cc8a Mon Sep 17 00:00:00 2001 From: supaiku <1311798+supaiku0@users.noreply.github.com> Date: Wed, 10 Jul 2019 04:27:16 +0200 Subject: [PATCH 03/23] release: 0.1.5 (#50) --- CHANGELOG.md | 5 +++++ build.gradle | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 284dcbff..5fac7553 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## Unreleased +## 0.1.5 - 2019-10-07 + +### Changed +- Updated dependencies + ## 0.1.4 - 2019-11-06 ### Fixed diff --git a/build.gradle b/build.gradle index c4fcfeca..9e17e03a 100644 --- a/build.gradle +++ b/build.gradle @@ -46,7 +46,7 @@ uploadArchives { pom.project { groupId = 'org.arkecosystem' - version = '0.1.4' + version = '0.1.5' artifactId = 'crypto' name = 'java-crypto' @@ -79,7 +79,7 @@ uploadArchives { scm { connection = 'scm:git:git://github.com/ArkEcosystem/java-crypto.git' developerConnection = 'scm:git:ssh://github.com:ArkEcosystem/java-crypto.git' - url = 'https://github.com/ArkEcosystem/java-crypto/tree/0.1.4' + url = 'https://github.com/ArkEcosystem/java-crypto/tree/0.1.5' } } } From 516912c42f5da79d1a10a8406fcb6c787869b93b Mon Sep 17 00:00:00 2001 From: supaiku <1311798+supaiku0@users.noreply.github.com> Date: Mon, 15 Jul 2019 20:52:05 +0200 Subject: [PATCH 04/23] chore: downgrade bitcoinj-core to 0.14.7 (#51) --- build.gradle | 2 +- .../crypto/transactions/Transaction.java | 13 ++----------- .../java/org/arkecosystem/crypto/utils/Message.java | 7 +------ 3 files changed, 4 insertions(+), 18 deletions(-) diff --git a/build.gradle b/build.gradle index 9e17e03a..63e70708 100644 --- a/build.gradle +++ b/build.gradle @@ -94,7 +94,7 @@ if (project.hasProperty("signing.keyId")) { } dependencies { - compile group: 'org.bitcoinj', name: 'bitcoinj-core', version: '0.15.2' + compile group: 'org.bitcoinj', name: 'bitcoinj-core', version: '0.14.7' compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.62' compile group: 'com.google.code.gson', name: 'gson', version: '2.8.0' compile 'com.google.guava:guava:28.0-jre' diff --git a/src/main/java/org/arkecosystem/crypto/transactions/Transaction.java b/src/main/java/org/arkecosystem/crypto/transactions/Transaction.java index ca80655c..d4d5b758 100644 --- a/src/main/java/org/arkecosystem/crypto/transactions/Transaction.java +++ b/src/main/java/org/arkecosystem/crypto/transactions/Transaction.java @@ -7,7 +7,6 @@ import org.arkecosystem.crypto.identities.PrivateKey; import org.bitcoinj.core.ECKey; import org.bitcoinj.core.Sha256Hash; -import org.bitcoinj.core.SignatureDecodeException; import java.lang.reflect.Type; import java.nio.ByteBuffer; @@ -67,11 +66,7 @@ public boolean verify() { byte[] signature = Hex.decode(this.signature); byte[] bytes = toBytes(); - try { - return ECKey.verify(Sha256Hash.hash(bytes), signature, keys.getPubKey()); - } catch (SignatureDecodeException e) { - return false; - } + return ECKey.verify(Sha256Hash.hash(bytes), signature, keys.getPubKey()); } public boolean secondVerify(String secondPublicKey) { @@ -80,11 +75,7 @@ public boolean secondVerify(String secondPublicKey) { byte[] signature = Hex.decode(this.signSignature); byte[] bytes = toBytes(false); - try { - return ECKey.verify(Sha256Hash.hash(bytes), signature, keys.getPubKey()); - } catch (SignatureDecodeException e) { - return false; - } + return ECKey.verify(Sha256Hash.hash(bytes), signature, keys.getPubKey()); } public Transaction parseSignatures(String serialized, int startOffset) { diff --git a/src/main/java/org/arkecosystem/crypto/utils/Message.java b/src/main/java/org/arkecosystem/crypto/utils/Message.java index bd638b4a..744c86a7 100644 --- a/src/main/java/org/arkecosystem/crypto/utils/Message.java +++ b/src/main/java/org/arkecosystem/crypto/utils/Message.java @@ -5,7 +5,6 @@ import org.arkecosystem.crypto.identities.PrivateKey; import org.bitcoinj.core.ECKey; import org.bitcoinj.core.Sha256Hash; -import org.bitcoinj.core.SignatureDecodeException; import java.util.HashMap; import java.util.Map; @@ -35,11 +34,7 @@ public boolean verify() { byte[] signature = Hex.decode(this.signature); byte[] messageBytes = Sha256Hash.hash(this.message.getBytes()); - try { - return ECKey.verify(messageBytes, signature, keys.getPubKey()); - } catch (SignatureDecodeException e) { - return false; - } + return ECKey.verify(messageBytes, signature, keys.getPubKey()); } public Map toMap() { From 8f1e5c3d11f3d571bf2e773f32e4c43507f43189 Mon Sep 17 00:00:00 2001 From: supaiku <1311798+supaiku0@users.noreply.github.com> Date: Mon, 15 Jul 2019 21:01:19 +0200 Subject: [PATCH 05/23] release: 0.1.6 (#52) --- CHANGELOG.md | 5 +++++ build.gradle | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5fac7553..6993f28e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## Unreleased +## 0.1.6 - 2019-10-15 + +### Changed +- Downgrade bitcoinj-core to 0.14.7 + ## 0.1.5 - 2019-10-07 ### Changed diff --git a/build.gradle b/build.gradle index 63e70708..a04c8151 100644 --- a/build.gradle +++ b/build.gradle @@ -46,7 +46,7 @@ uploadArchives { pom.project { groupId = 'org.arkecosystem' - version = '0.1.5' + version = '0.1.6' artifactId = 'crypto' name = 'java-crypto' @@ -79,7 +79,7 @@ uploadArchives { scm { connection = 'scm:git:git://github.com/ArkEcosystem/java-crypto.git' developerConnection = 'scm:git:ssh://github.com:ArkEcosystem/java-crypto.git' - url = 'https://github.com/ArkEcosystem/java-crypto/tree/0.1.5' + url = 'https://github.com/ArkEcosystem/java-crypto/tree/0.1.6' } } } From d5945255ee12ac7f5c2a9c88cb4e07fc7ea10210 Mon Sep 17 00:00:00 2001 From: Brian Faust Date: Mon, 22 Jul 2019 07:56:32 +0300 Subject: [PATCH 06/23] chore: setup probot/stale configuration --- .github/stale.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 .github/stale.yml diff --git a/.github/stale.yml b/.github/stale.yml new file mode 100644 index 00000000..0d0b1c99 --- /dev/null +++ b/.github/stale.yml @@ -0,0 +1 @@ +_extends: .github From 4704463aae3f7cb479b1d4c2e8e63117d4f9d62c Mon Sep 17 00:00:00 2001 From: Brian Faust Date: Mon, 22 Jul 2019 09:27:47 +0300 Subject: [PATCH 07/23] chore(readme): add lead maintainer information (#54) --- README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index c42560b6..6e6ce947 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,8 @@ [![Latest Version](https://badgen.now.sh/github/release/ArkEcosystem/java-crypto)](https://github.com/ArkEcosystem/java-crypto/releases) [![License: MIT](https://badgen.now.sh/badge/license/MIT/green)](https://opensource.org/licenses/MIT) +> Lead Maintainer: [Joshua Noack](https://github.com/supaiku0) + ## Documentation You can find installation instructions and detailed instructions on how to use this package at the [dedicated documentation site](https://docs.ark.io/sdk/cryptography/java.html). @@ -21,9 +23,8 @@ If you discover a security vulnerability within this package, please send an e-m ## Credits -- [Brian Faust](https://github.com/faustbrian) -- [All Contributors](../../../../contributors) +This project exists thanks to all the people who [contribute](../../contributors). ## License -[MIT](LICENSE) © [ArkEcosystem](https://ark.io) +[MIT](LICENSE) © [ARK Ecosystem](https://ark.io) From 07534b1f3bb58da4fbf7cb8b48cc9a663d9d2b14 Mon Sep 17 00:00:00 2001 From: Brian Faust Date: Sat, 21 Sep 2019 09:11:59 +0300 Subject: [PATCH 08/23] ci: setup github action workflow for testing --- .circleci/config.yml | 29 ----------------------------- .github/workflows/test.yml | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 29 deletions(-) delete mode 100644 .circleci/config.yml create mode 100644 .github/workflows/test.yml diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 8711a4d3..00000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,29 +0,0 @@ -version: 2 -jobs: - build: - docker: - - image: circleci/openjdk:8-jdk - working_directory: ~/arkecosystem/crypto - environment: - JVM_OPTS: -Xmx3200m - TERM: dumb - steps: - - checkout - - restore_cache: - keys: - - v1-dependencies-{{ checksum "build.gradle" }} - - v1-dependencies- - - run: gradle dependencies - - save_cache: - paths: - - ~/.gradle - key: v1-dependencies-{{ checksum "build.gradle" }} - - run: - name: Tests - command: | - gradle test - gradle jacocoTestReport - - run: - name: Codecov - when: on_success - command: bash <(curl -s https://codecov.io/bash) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 00000000..6d521470 --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,18 @@ +name: Test + +on: [push, pull_request] + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + - name: Set up JDK 1.8 + uses: actions/setup-java@v1 + with: + java-version: 1.8 + - name: Install + run: gradle dependencies + - name: Test + run: gradle test From bbe2838bc6464e2cd3913d0bc7994a06ea9d1338 Mon Sep 17 00:00:00 2001 From: Brian Faust Date: Mon, 23 Sep 2019 10:19:48 +0300 Subject: [PATCH 09/23] ci: adjust job triggers (#58) --- .github/workflows/test.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6d521470..d96c7a24 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,9 +1,14 @@ name: Test -on: [push, pull_request] +on: + push: + branches: + - '**' + pull_request: + types: [opened] jobs: - build: + unit: runs-on: ubuntu-latest steps: From e1965b8a42220ccbaf47096aec2d772c8f2fd9ab Mon Sep 17 00:00:00 2001 From: Brian Faust Date: Mon, 23 Sep 2019 11:46:46 +0300 Subject: [PATCH 10/23] ci: report coverage to codecov (#59) --- .github/workflows/test.yml | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d96c7a24..61b4922d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,16 +8,18 @@ on: types: [opened] jobs: - unit: - runs-on: ubuntu-latest + unit: + runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v1 - - name: Set up JDK 1.8 - uses: actions/setup-java@v1 - with: - java-version: 1.8 - - name: Install - run: gradle dependencies - - name: Test - run: gradle test + steps: + - uses: actions/checkout@v1 + - name: Set up JDK 1.8 + uses: actions/setup-java@v1 + with: + java-version: 1.8 + - name: Install + run: gradle dependencies + - name: Test + run: gradle test && gradle jacocoTestReport + - name: Codecov + run: bash <(curl -s https://codecov.io/bash) -t ${{ secrets.CODECOV_TOKEN }} From 26cc5b511ea7a1599896b461876c3d0f7b7da84b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 27 Sep 2019 13:50:46 +0300 Subject: [PATCH 11/23] chore(deps): add renovate.json (#60) --- renovate.json | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 renovate.json diff --git a/renovate.json b/renovate.json new file mode 100644 index 00000000..042ab22c --- /dev/null +++ b/renovate.json @@ -0,0 +1,3 @@ +{ + "extends": ["config:base", ":preserveSemverRanges"] +} From ced89aae1d54d7b704dc95742cd51009c1a286e1 Mon Sep 17 00:00:00 2001 From: Edgar Goetzendorff Date: Sat, 19 Oct 2019 08:11:25 +0200 Subject: [PATCH 12/23] chore: update workflow config (#66) --- .github/workflows/test.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 61b4922d..8f9805d4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,11 +1,12 @@ name: Test on: - push: - branches: - - '**' - pull_request: - types: [opened] + push: + branches: + - "master" + - "develop" + pull_request: + types: [ready_for_review, synchronize, opened] jobs: unit: From 110d4d9019136dc8af0ecbe37bacf826533ce7f1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 15 Jan 2020 08:11:36 +0100 Subject: [PATCH 13/23] chore(deps): update dependency gradle to v6 (#70) Co-authored-by: WhiteSource Renovate --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 196cac00..c6757d65 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip From 83ed4965b8a01a45d9f6f374de6ada9f80adddcd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 15 Jan 2020 08:13:29 +0100 Subject: [PATCH 14/23] chore(deps): update dependency com.google.code.gson:gson to v2.8.6 (#71) Co-authored-by: WhiteSource Renovate --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index a04c8151..313c5916 100644 --- a/build.gradle +++ b/build.gradle @@ -96,7 +96,7 @@ if (project.hasProperty("signing.keyId")) { dependencies { compile group: 'org.bitcoinj', name: 'bitcoinj-core', version: '0.14.7' compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.62' - compile group: 'com.google.code.gson', name: 'gson', version: '2.8.0' + compile group: 'com.google.code.gson', name: 'gson', version: '2.8.6' compile 'com.google.guava:guava:28.0-jre' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.0' From 9ea46055d37b4a038f2722d68a790c77b1040180 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 15 Jan 2020 08:15:09 +0100 Subject: [PATCH 15/23] chore(deps): update dependency org.bitcoinj:bitcoinj-core to v0.15.6 (#72) Co-authored-by: WhiteSource Renovate --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 313c5916..a7b469c0 100644 --- a/build.gradle +++ b/build.gradle @@ -94,7 +94,7 @@ if (project.hasProperty("signing.keyId")) { } dependencies { - compile group: 'org.bitcoinj', name: 'bitcoinj-core', version: '0.14.7' + compile group: 'org.bitcoinj', name: 'bitcoinj-core', version: '0.15.6' compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.62' compile group: 'com.google.code.gson', name: 'gson', version: '2.8.6' compile 'com.google.guava:guava:28.0-jre' From 220df6ef544f07ce88c1026eac40cdb79b0f5f93 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 15 Jan 2020 08:22:29 +0100 Subject: [PATCH 16/23] chore(deps): update dependency org.bouncycastle:bcprov-jdk15on to v1.64 (#73) Co-authored-by: WhiteSource Renovate --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index a7b469c0..073854d0 100644 --- a/build.gradle +++ b/build.gradle @@ -95,7 +95,7 @@ if (project.hasProperty("signing.keyId")) { dependencies { compile group: 'org.bitcoinj', name: 'bitcoinj-core', version: '0.15.6' - compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.62' + compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.64' compile group: 'com.google.code.gson', name: 'gson', version: '2.8.6' compile 'com.google.guava:guava:28.0-jre' From d019e25d88f236b7793b5a164f8d6c65f1240209 Mon Sep 17 00:00:00 2001 From: Kristjan Kosic Date: Wed, 15 Jan 2020 19:52:19 +0100 Subject: [PATCH 17/23] fix: handle SignatureDecodeException (#85) * fix: handle SignatureDecodeException * fix: exception handling in Message.java re: update bitcoinj * fix: remove bouncy castle from deps // collision with bitcoinj * chore: update guava package --- build.gradle | 13 +++++++++---- .../crypto/transactions/Transaction.java | 13 +++++++++++-- .../java/org/arkecosystem/crypto/utils/Message.java | 7 ++++++- 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 073854d0..47147607 100644 --- a/build.gradle +++ b/build.gradle @@ -74,6 +74,12 @@ uploadArchives { organization = 'Ark Ecosystem' organizationUrl = 'https://ark.io' } + developer { + name = 'Kristjan Kosic' + email = 'kristjan@ark.io' + organization = 'Ark Ecosystem' + organizationUrl = 'https://ark.io' + } } scm { @@ -95,12 +101,11 @@ if (project.hasProperty("signing.keyId")) { dependencies { compile group: 'org.bitcoinj', name: 'bitcoinj-core', version: '0.15.6' - compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.64' compile group: 'com.google.code.gson', name: 'gson', version: '2.8.6' - compile 'com.google.guava:guava:28.0-jre' + compile 'com.google.guava:guava:28.2-jre' - testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.0' - testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.0' + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.2' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.2' } test { diff --git a/src/main/java/org/arkecosystem/crypto/transactions/Transaction.java b/src/main/java/org/arkecosystem/crypto/transactions/Transaction.java index d4d5b758..ca80655c 100644 --- a/src/main/java/org/arkecosystem/crypto/transactions/Transaction.java +++ b/src/main/java/org/arkecosystem/crypto/transactions/Transaction.java @@ -7,6 +7,7 @@ import org.arkecosystem.crypto.identities.PrivateKey; import org.bitcoinj.core.ECKey; import org.bitcoinj.core.Sha256Hash; +import org.bitcoinj.core.SignatureDecodeException; import java.lang.reflect.Type; import java.nio.ByteBuffer; @@ -66,7 +67,11 @@ public boolean verify() { byte[] signature = Hex.decode(this.signature); byte[] bytes = toBytes(); - return ECKey.verify(Sha256Hash.hash(bytes), signature, keys.getPubKey()); + try { + return ECKey.verify(Sha256Hash.hash(bytes), signature, keys.getPubKey()); + } catch (SignatureDecodeException e) { + return false; + } } public boolean secondVerify(String secondPublicKey) { @@ -75,7 +80,11 @@ public boolean secondVerify(String secondPublicKey) { byte[] signature = Hex.decode(this.signSignature); byte[] bytes = toBytes(false); - return ECKey.verify(Sha256Hash.hash(bytes), signature, keys.getPubKey()); + try { + return ECKey.verify(Sha256Hash.hash(bytes), signature, keys.getPubKey()); + } catch (SignatureDecodeException e) { + return false; + } } public Transaction parseSignatures(String serialized, int startOffset) { diff --git a/src/main/java/org/arkecosystem/crypto/utils/Message.java b/src/main/java/org/arkecosystem/crypto/utils/Message.java index 744c86a7..bd638b4a 100644 --- a/src/main/java/org/arkecosystem/crypto/utils/Message.java +++ b/src/main/java/org/arkecosystem/crypto/utils/Message.java @@ -5,6 +5,7 @@ import org.arkecosystem.crypto.identities.PrivateKey; import org.bitcoinj.core.ECKey; import org.bitcoinj.core.Sha256Hash; +import org.bitcoinj.core.SignatureDecodeException; import java.util.HashMap; import java.util.Map; @@ -34,7 +35,11 @@ public boolean verify() { byte[] signature = Hex.decode(this.signature); byte[] messageBytes = Sha256Hash.hash(this.message.getBytes()); - return ECKey.verify(messageBytes, signature, keys.getPubKey()); + try { + return ECKey.verify(messageBytes, signature, keys.getPubKey()); + } catch (SignatureDecodeException e) { + return false; + } } public Map toMap() { From 1f0cd7e6ea836fe1d7e90cc26bf8fa0e845c4dd2 Mon Sep 17 00:00:00 2001 From: Kristjan Kosic - Chris Date: Wed, 15 Jan 2020 20:22:42 +0100 Subject: [PATCH 18/23] style: spotless --- .../crypto/transactions/Transaction.java | 36 ++++++++++--------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/src/main/java/org/arkecosystem/crypto/transactions/Transaction.java b/src/main/java/org/arkecosystem/crypto/transactions/Transaction.java index b0fa9699..5252467d 100644 --- a/src/main/java/org/arkecosystem/crypto/transactions/Transaction.java +++ b/src/main/java/org/arkecosystem/crypto/transactions/Transaction.java @@ -1,14 +1,6 @@ package org.arkecosystem.crypto.transactions; import com.google.gson.*; -import org.arkecosystem.crypto.encoding.Base58; -import org.arkecosystem.crypto.encoding.Hex; -import org.arkecosystem.crypto.enums.Types; -import org.arkecosystem.crypto.identities.PrivateKey; -import org.bitcoinj.core.ECKey; -import org.bitcoinj.core.Sha256Hash; -import org.bitcoinj.core.SignatureDecodeException; - import java.lang.reflect.Type; import java.nio.ByteBuffer; import java.nio.ByteOrder; @@ -21,6 +13,7 @@ import org.arkecosystem.crypto.identities.PrivateKey; import org.bitcoinj.core.ECKey; import org.bitcoinj.core.Sha256Hash; +import org.bitcoinj.core.SignatureDecodeException; public class Transaction { public int expiration; @@ -56,7 +49,8 @@ public Transaction sign(String passphrase) { ECKey privateKey = PrivateKey.fromPassphrase(passphrase); this.senderPublicKey = privateKey.getPublicKeyAsHex(); - this.signature = Hex.encode(privateKey.sign(Sha256Hash.of(toBytes(true, true))).encodeToDER()); + this.signature = + Hex.encode(privateKey.sign(Sha256Hash.of(toBytes(true, true))).encodeToDER()); return this; } @@ -64,7 +58,8 @@ public Transaction sign(String passphrase) { public Transaction secondSign(String passphrase) { ECKey privateKey = PrivateKey.fromPassphrase(passphrase); - this.signSignature = Hex.encode(privateKey.sign(Sha256Hash.of(toBytes(false, true))).encodeToDER()); + this.signSignature = + Hex.encode(privateKey.sign(Sha256Hash.of(toBytes(false, true))).encodeToDER()); return this; } @@ -121,8 +116,10 @@ public Transaction parseSignatures(String serialized, int startOffset) { if ("ff".equals(this.secondSignature.substring(0, 2))) { this.secondSignature = null; } else { - int secondSignatureLength = Integer.parseInt(this.secondSignature.substring(2, 4), 16) + 2; - this.secondSignature = this.secondSignature.substring(0, secondSignatureLength * 2); + int secondSignatureLength = + Integer.parseInt(this.secondSignature.substring(2, 4), 16) + 2; + this.secondSignature = + this.secondSignature.substring(0, secondSignatureLength * 2); multiSignatureOffset += secondSignatureLength * 2; } } @@ -168,8 +165,10 @@ private byte[] toBytesV1(boolean skipSignature, boolean skipSecondSignature) { buffer.putInt(timestamp); buffer.put(Hex.decode(this.senderPublicKey)); - boolean skipRecipientId = this.type == CoreTransactionTypes.SECOND_SIGNATURE_REGISTRATION.getValue() - || this.type == CoreTransactionTypes.MULTI_SIGNATURE_REGISTRATION.getValue(); + boolean skipRecipientId = + this.type == CoreTransactionTypes.SECOND_SIGNATURE_REGISTRATION.getValue() + || this.type + == CoreTransactionTypes.MULTI_SIGNATURE_REGISTRATION.getValue(); if (recipientId != null && !recipientId.isEmpty() && !skipRecipientId) { buffer.put(Base58.decodeChecked(this.recipientId)); } else { @@ -295,9 +294,11 @@ public HashMap toHashMap() { return map; } - private static class TransactionTypeDeserializer implements JsonDeserializer { + private static class TransactionTypeDeserializer + implements JsonDeserializer { @Override - public CoreTransactionTypes deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) + public CoreTransactionTypes deserialize( + JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { return CoreTransactionTypes.values()[json.getAsInt()]; } @@ -305,7 +306,8 @@ public CoreTransactionTypes deserialize(JsonElement json, Type typeOfT, JsonDese private static class TransactionTypeSerializer implements JsonSerializer { @Override - public JsonElement serialize(CoreTransactionTypes src, Type typeOfSrc, JsonSerializationContext context) { + public JsonElement serialize( + CoreTransactionTypes src, Type typeOfSrc, JsonSerializationContext context) { return new JsonPrimitive(src.getValue()); } } From bdfb9beda97c5de4a4c1c11b3ab739f1efdd96e2 Mon Sep 17 00:00:00 2001 From: Kristjan Kosic - Chris Date: Wed, 15 Jan 2020 21:48:54 +0100 Subject: [PATCH 19/23] style: spotless included now in test folder to --- build.gradle | 3 +- .../crypto/configuration/FeeTest.java | 11 +- .../crypto/configuration/NetworkTest.java | 4 +- .../crypto/identities/AddressTest.java | 11 +- .../crypto/identities/PrivateKeyTest.java | 13 +- .../crypto/identities/PublicKeyTest.java | 12 +- .../crypto/identities/WIFTest.java | 4 +- .../crypto/networks/DevnetTest.java | 4 +- .../crypto/networks/MainnetTest.java | 4 +- .../crypto/networks/TestnetTest.java | 4 +- .../crypto/transactions/FixtureLoader.java | 7 +- .../builder/DelegateRegistrationTest.java | 68 +++++----- .../builder/DelegateResignationTest.java | 32 +++-- .../transactions/builder/HtlcClaimTest.java | 36 +++-- .../transactions/builder/HtlcLockTest.java | 46 ++++--- .../transactions/builder/HtlcRefundTest.java | 35 ++--- .../crypto/transactions/builder/IpfsTest.java | 36 ++--- .../builder/MultiPaymentTest.java | 39 +++--- .../MultiSignatureRegistrationTest.java | 56 ++++---- .../SecondSignatureRegistrationTest.java | 29 ++-- .../transactions/builder/TransferTest.java | 83 ++++++------ .../crypto/transactions/builder/VoteTest.java | 78 ++++++----- .../DelegateRegistrationTest.java | 60 ++++++--- .../DelegateResignationTest.java | 14 +- .../deserializers/HtlcClaimTest.java | 27 ++-- .../deserializers/HtlcLockTest.java | 45 ++++--- .../deserializers/HtlcRefundTest.java | 26 ++-- .../transactions/deserializers/IpfsTest.java | 10 +- .../deserializers/MultiPaymentTest.java | 41 +++--- .../MultiSignatureRegistrationTest.java | 15 ++- .../SecondSignatureRegistrationTest.java | 35 +++-- .../deserializers/TransferTest.java | 127 +++++++++++------- .../transactions/deserializers/VoteTest.java | 43 +++--- .../serializers/DelegateRegistrationTest.java | 31 +++-- .../serializers/DelegateResignationTest.java | 16 ++- .../serializers/HtlcClaimTest.java | 17 ++- .../serializers/HtlcLockTest.java | 17 ++- .../serializers/HtlcRefundTest.java | 16 ++- .../transactions/serializers/IpfsTest.java | 16 ++- .../serializers/MultiPaymentTest.java | 16 ++- .../MultiSignatureRegistrationTest.java | 11 +- .../SecondSignatureRegistrationTest.java | 19 +-- .../serializers/TransferTest.java | 85 +++++++----- .../transactions/serializers/VoteTest.java | 31 +++-- .../crypto/utils/MessageTest.java | 26 ++-- .../arkecosystem/crypto/utils/SlotTest.java | 4 +- 46 files changed, 792 insertions(+), 571 deletions(-) diff --git a/build.gradle b/build.gradle index a7d165d6..47cbdc4a 100644 --- a/build.gradle +++ b/build.gradle @@ -143,6 +143,7 @@ wrapper { java { target fileTree(projectDir) { include 'src/main/**/*.java' + include 'src/test/**/*.java' exclude '**/build/**' } googleJavaFormat('1.1').aosp() @@ -150,6 +151,6 @@ wrapper { } -task formatCode(dependsOn: ['licenseFormat','spotlessApply']) +task formatCode(dependsOn: ['spotlessApply']) build.dependsOn 'spotlessApply' diff --git a/src/test/java/org/arkecosystem/crypto/configuration/FeeTest.java b/src/test/java/org/arkecosystem/crypto/configuration/FeeTest.java index c05e271f..1ecf537a 100644 --- a/src/test/java/org/arkecosystem/crypto/configuration/FeeTest.java +++ b/src/test/java/org/arkecosystem/crypto/configuration/FeeTest.java @@ -1,12 +1,11 @@ package org.arkecosystem.crypto.configuration; -import org.arkecosystem.crypto.enums.CoreTransactionTypes; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.HashMap; import java.util.Map; - -import static org.junit.jupiter.api.Assertions.assertEquals; +import org.arkecosystem.crypto.enums.CoreTransactionTypes; +import org.junit.jupiter.api.Test; class FeeTest { @@ -20,8 +19,8 @@ void get() { void set() { Map fees = new HashMap<>(); fees.put(500, 1L); - Fee.set(1001,fees); - long fee = Fee.getFee(1001,500); + Fee.set(1001, fees); + long fee = Fee.getFee(1001, 500); assertEquals(1L, fee); } } diff --git a/src/test/java/org/arkecosystem/crypto/configuration/NetworkTest.java b/src/test/java/org/arkecosystem/crypto/configuration/NetworkTest.java index c7a7c477..a18b111e 100644 --- a/src/test/java/org/arkecosystem/crypto/configuration/NetworkTest.java +++ b/src/test/java/org/arkecosystem/crypto/configuration/NetworkTest.java @@ -1,12 +1,12 @@ package org.arkecosystem.crypto.configuration; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.arkecosystem.crypto.networks.INetwork; import org.arkecosystem.crypto.networks.Mainnet; import org.arkecosystem.crypto.networks.Testnet; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; - class NetworkTest { @Test diff --git a/src/test/java/org/arkecosystem/crypto/identities/AddressTest.java b/src/test/java/org/arkecosystem/crypto/identities/AddressTest.java index 2c7afcec..33cde63c 100644 --- a/src/test/java/org/arkecosystem/crypto/identities/AddressTest.java +++ b/src/test/java/org/arkecosystem/crypto/identities/AddressTest.java @@ -1,13 +1,13 @@ package org.arkecosystem.crypto.identities; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.arkecosystem.crypto.configuration.Network; import org.arkecosystem.crypto.networks.Devnet; import org.bitcoinj.core.ECKey; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - public class AddressTest { @Test @@ -19,7 +19,9 @@ public void fromPassphrase() { @Test public void fromPublicKey() { - String actual = Address.fromPublicKey("034151a3ec46b5670a682b0a63394f863587d1bc97483b1b6c70eb58e7f0aed192"); + String actual = + Address.fromPublicKey( + "034151a3ec46b5670a682b0a63394f863587d1bc97483b1b6c70eb58e7f0aed192"); assertEquals("D61mfSggzbvQgTUe6JhYKH2doHaqJ3Dyib", actual); } @@ -35,5 +37,4 @@ public void validate() { Network.set(new Devnet()); assertTrue(Address.validate("D61mfSggzbvQgTUe6JhYKH2doHaqJ3Dyib")); } - } diff --git a/src/test/java/org/arkecosystem/crypto/identities/PrivateKeyTest.java b/src/test/java/org/arkecosystem/crypto/identities/PrivateKeyTest.java index 768a6951..9363c423 100644 --- a/src/test/java/org/arkecosystem/crypto/identities/PrivateKeyTest.java +++ b/src/test/java/org/arkecosystem/crypto/identities/PrivateKeyTest.java @@ -1,21 +1,24 @@ package org.arkecosystem.crypto.identities; -import org.junit.jupiter.api.Test; - import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.Test; + public class PrivateKeyTest { @Test public void fromPassphrase() { - String actual = PrivateKey.fromPassphrase("this is a top secret passphrase").getPrivateKeyAsHex(); + String actual = + PrivateKey.fromPassphrase("this is a top secret passphrase").getPrivateKeyAsHex(); assertEquals("d8839c2432bfd0a67ef10a804ba991eabba19f154a3d707917681d45822a5712", actual); } @Test public void fromHex() { - String actual = PrivateKey.fromHex("d8839c2432bfd0a67ef10a804ba991eabba19f154a3d707917681d45822a5712").getPrivateKeyAsHex(); + String actual = + PrivateKey.fromHex( + "d8839c2432bfd0a67ef10a804ba991eabba19f154a3d707917681d45822a5712") + .getPrivateKeyAsHex(); assertEquals("d8839c2432bfd0a67ef10a804ba991eabba19f154a3d707917681d45822a5712", actual); } - } diff --git a/src/test/java/org/arkecosystem/crypto/identities/PublicKeyTest.java b/src/test/java/org/arkecosystem/crypto/identities/PublicKeyTest.java index bdb54e27..274b48e3 100644 --- a/src/test/java/org/arkecosystem/crypto/identities/PublicKeyTest.java +++ b/src/test/java/org/arkecosystem/crypto/identities/PublicKeyTest.java @@ -7,13 +7,17 @@ public class PublicKeyTest { @Test public void fromPassphrase() { String actual = PublicKey.fromPassphrase("this is a top secret passphrase"); - Assertions.assertEquals("034151a3ec46b5670a682b0a63394f863587d1bc97483b1b6c70eb58e7f0aed192", actual); + Assertions.assertEquals( + "034151a3ec46b5670a682b0a63394f863587d1bc97483b1b6c70eb58e7f0aed192", actual); } @Test public void fromHex() { - String actual = PrivateKey.fromHex("d8839c2432bfd0a67ef10a804ba991eabba19f154a3d707917681d45822a5712").getPrivateKeyAsHex(); - Assertions.assertEquals("d8839c2432bfd0a67ef10a804ba991eabba19f154a3d707917681d45822a5712", actual); + String actual = + PrivateKey.fromHex( + "d8839c2432bfd0a67ef10a804ba991eabba19f154a3d707917681d45822a5712") + .getPrivateKeyAsHex(); + Assertions.assertEquals( + "d8839c2432bfd0a67ef10a804ba991eabba19f154a3d707917681d45822a5712", actual); } - } diff --git a/src/test/java/org/arkecosystem/crypto/identities/WIFTest.java b/src/test/java/org/arkecosystem/crypto/identities/WIFTest.java index 4c4f9d2a..cfe4f4ee 100644 --- a/src/test/java/org/arkecosystem/crypto/identities/WIFTest.java +++ b/src/test/java/org/arkecosystem/crypto/identities/WIFTest.java @@ -1,10 +1,9 @@ package org.arkecosystem.crypto.identities; +import java.io.IOException; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import java.io.IOException; - public class WIFTest { @Test @@ -12,5 +11,4 @@ public void fromPassphrase() throws IOException { String actual = WIF.fromPassphrase("this is a top secret passphrase"); Assertions.assertEquals("SGq4xLgZKCGxs7bjmwnBrWcT4C1ADFEermj846KC97FSv1WFD1dA", actual); } - } diff --git a/src/test/java/org/arkecosystem/crypto/networks/DevnetTest.java b/src/test/java/org/arkecosystem/crypto/networks/DevnetTest.java index 2e654f14..81c490d3 100644 --- a/src/test/java/org/arkecosystem/crypto/networks/DevnetTest.java +++ b/src/test/java/org/arkecosystem/crypto/networks/DevnetTest.java @@ -1,9 +1,9 @@ package org.arkecosystem.crypto.networks; -import org.junit.jupiter.api.Test; - import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.Test; + class DevnetTest { @Test diff --git a/src/test/java/org/arkecosystem/crypto/networks/MainnetTest.java b/src/test/java/org/arkecosystem/crypto/networks/MainnetTest.java index 2dddd3c1..5e1f3c9a 100644 --- a/src/test/java/org/arkecosystem/crypto/networks/MainnetTest.java +++ b/src/test/java/org/arkecosystem/crypto/networks/MainnetTest.java @@ -1,9 +1,9 @@ package org.arkecosystem.crypto.networks; -import org.junit.jupiter.api.Test; - import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.Test; + class MainnetTest { @Test diff --git a/src/test/java/org/arkecosystem/crypto/networks/TestnetTest.java b/src/test/java/org/arkecosystem/crypto/networks/TestnetTest.java index c63b08b6..d31e0139 100644 --- a/src/test/java/org/arkecosystem/crypto/networks/TestnetTest.java +++ b/src/test/java/org/arkecosystem/crypto/networks/TestnetTest.java @@ -1,9 +1,9 @@ package org.arkecosystem.crypto.networks; -import org.junit.jupiter.api.Test; - import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.Test; + class TestnetTest { @Test diff --git a/src/test/java/org/arkecosystem/crypto/transactions/FixtureLoader.java b/src/test/java/org/arkecosystem/crypto/transactions/FixtureLoader.java index 0251afd5..67258896 100644 --- a/src/test/java/org/arkecosystem/crypto/transactions/FixtureLoader.java +++ b/src/test/java/org/arkecosystem/crypto/transactions/FixtureLoader.java @@ -2,7 +2,6 @@ import com.google.gson.Gson; import com.google.gson.internal.LinkedTreeMap; - import java.io.IOException; import java.net.URL; import java.nio.charset.StandardCharsets; @@ -14,12 +13,14 @@ public class FixtureLoader { private static String readFile(String path) throws IOException { ClassLoader classLoader = Transaction.class.getClassLoader(); URL resource = classLoader.getResource(String.format("%s.json", path)); - return new String(Files.readAllBytes(Paths.get(resource.getPath())), StandardCharsets.UTF_8); + return new String( + Files.readAllBytes(Paths.get(resource.getPath())), StandardCharsets.UTF_8); } public static LinkedTreeMap load(String path) { try { - return new Gson().fromJson(readFile(path), new LinkedTreeMap().getClass()); + return new Gson() + .fromJson(readFile(path), new LinkedTreeMap().getClass()); } catch (IOException e) { e.printStackTrace(); return null; diff --git a/src/test/java/org/arkecosystem/crypto/transactions/builder/DelegateRegistrationTest.java b/src/test/java/org/arkecosystem/crypto/transactions/builder/DelegateRegistrationTest.java index 2659ed64..f84bd51b 100644 --- a/src/test/java/org/arkecosystem/crypto/transactions/builder/DelegateRegistrationTest.java +++ b/src/test/java/org/arkecosystem/crypto/transactions/builder/DelegateRegistrationTest.java @@ -1,56 +1,60 @@ package org.arkecosystem.crypto.transactions.builder; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.arkecosystem.crypto.transactions.Transaction; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertTrue; - public class DelegateRegistrationTest { @Test void build() { - Transaction actualV1 = new DelegateRegistration() - .username("java") - .version(1) - .sign("this is a top secret passphrase") - .transaction; + Transaction actualV1 = + new DelegateRegistration() + .username("java") + .version(1) + .sign("this is a top secret passphrase") + .transaction; assertTrue(actualV1.verify()); - Transaction actualV2 = new DelegateRegistration() - .username("java") - .version(2) - .nonce(3) - .sign("this is a top secret passphrase") - .transaction; + Transaction actualV2 = + new DelegateRegistration() + .username("java") + .version(2) + .nonce(3) + .sign("this is a top secret passphrase") + .transaction; assertTrue(actualV2.verify()); } @Test void buildSecondSignature() { - Transaction actualV1 = new DelegateRegistration() - .username("java") - .sign("this is a top secret passphrase") - .secondSign("this is a top secret second passphrase") - .transaction; + Transaction actualV1 = + new DelegateRegistration() + .username("java") + .sign("this is a top secret passphrase") + .secondSign("this is a top secret second passphrase") + .transaction; assertTrue(actualV1.verify()); - assertTrue(actualV1.secondVerify("03699e966b2525f9088a6941d8d94f7869964a000efe65783d78ac82e1199fe609")); - - - Transaction actualV2 = new DelegateRegistration() - .username("java") - .version(2) - .nonce(3) - .sign("this is a top secret passphrase") - .secondSign("this is a top secret second passphrase") - .transaction; + assertTrue( + actualV1.secondVerify( + "03699e966b2525f9088a6941d8d94f7869964a000efe65783d78ac82e1199fe609")); + + Transaction actualV2 = + new DelegateRegistration() + .username("java") + .version(2) + .nonce(3) + .sign("this is a top secret passphrase") + .secondSign("this is a top secret second passphrase") + .transaction; assertTrue(actualV2.verify()); - assertTrue(actualV2.secondVerify("03699e966b2525f9088a6941d8d94f7869964a000efe65783d78ac82e1199fe609")); - - + assertTrue( + actualV2.secondVerify( + "03699e966b2525f9088a6941d8d94f7869964a000efe65783d78ac82e1199fe609")); } - } diff --git a/src/test/java/org/arkecosystem/crypto/transactions/builder/DelegateResignationTest.java b/src/test/java/org/arkecosystem/crypto/transactions/builder/DelegateResignationTest.java index b04e3830..03aa0651 100644 --- a/src/test/java/org/arkecosystem/crypto/transactions/builder/DelegateResignationTest.java +++ b/src/test/java/org/arkecosystem/crypto/transactions/builder/DelegateResignationTest.java @@ -1,33 +1,37 @@ package org.arkecosystem.crypto.transactions.builder; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.arkecosystem.crypto.transactions.Transaction; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertTrue; - public class DelegateResignationTest { @Test void build() { - Transaction actual = new DelegateResignation() - .version(2) - .nonce(3) - .sign("this is a top secret passphrase") - .transaction; + Transaction actual = + new DelegateResignation() + .version(2) + .nonce(3) + .sign("this is a top secret passphrase") + .transaction; assertTrue(actual.verify()); } @Test void buildSecondSignature() { - Transaction actual = new DelegateResignation() - .version(2) - .nonce(3) - .sign("this is a top secret passphrase") - .secondSign("this is a top secret second passphrase") - .transaction; + Transaction actual = + new DelegateResignation() + .version(2) + .nonce(3) + .sign("this is a top secret passphrase") + .secondSign("this is a top secret second passphrase") + .transaction; assertTrue(actual.verify()); - assertTrue(actual.secondVerify("03699e966b2525f9088a6941d8d94f7869964a000efe65783d78ac82e1199fe609")); + assertTrue( + actual.secondVerify( + "03699e966b2525f9088a6941d8d94f7869964a000efe65783d78ac82e1199fe609")); } } diff --git a/src/test/java/org/arkecosystem/crypto/transactions/builder/HtlcClaimTest.java b/src/test/java/org/arkecosystem/crypto/transactions/builder/HtlcClaimTest.java index 3e6979a0..4760e8d8 100644 --- a/src/test/java/org/arkecosystem/crypto/transactions/builder/HtlcClaimTest.java +++ b/src/test/java/org/arkecosystem/crypto/transactions/builder/HtlcClaimTest.java @@ -1,32 +1,40 @@ package org.arkecosystem.crypto.transactions.builder; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.arkecosystem.crypto.transactions.Transaction; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertTrue; - public class HtlcClaimTest { @Test void build() { - Transaction actual = new HtlcClaim() - .htlcClaimAsset("943c220691e711c39c79d437ce185748a0018940e1a4144293af9d05627d2eb4","aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa") - .nonce(3) - .sign("this is a top secret passphrase") - .transaction; + Transaction actual = + new HtlcClaim() + .htlcClaimAsset( + "943c220691e711c39c79d437ce185748a0018940e1a4144293af9d05627d2eb4", + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa") + .nonce(3) + .sign("this is a top secret passphrase") + .transaction; assertTrue(actual.verify()); } @Test void buildSecondSignature() { - Transaction actual = new HtlcClaim() - .htlcClaimAsset("943c220691e711c39c79d437ce185748a0018940e1a4144293af9d05627d2eb4","aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa") - .nonce(3) - .sign("this is a top secret passphrase") - .secondSign("this is a top secret second passphrase") - .transaction; + Transaction actual = + new HtlcClaim() + .htlcClaimAsset( + "943c220691e711c39c79d437ce185748a0018940e1a4144293af9d05627d2eb4", + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa") + .nonce(3) + .sign("this is a top secret passphrase") + .secondSign("this is a top secret second passphrase") + .transaction; assertTrue(actual.verify()); - assertTrue(actual.secondVerify("03699e966b2525f9088a6941d8d94f7869964a000efe65783d78ac82e1199fe609")); + assertTrue( + actual.secondVerify( + "03699e966b2525f9088a6941d8d94f7869964a000efe65783d78ac82e1199fe609")); } } diff --git a/src/test/java/org/arkecosystem/crypto/transactions/builder/HtlcLockTest.java b/src/test/java/org/arkecosystem/crypto/transactions/builder/HtlcLockTest.java index dbc6c773..e0fc9126 100644 --- a/src/test/java/org/arkecosystem/crypto/transactions/builder/HtlcLockTest.java +++ b/src/test/java/org/arkecosystem/crypto/transactions/builder/HtlcLockTest.java @@ -1,39 +1,45 @@ package org.arkecosystem.crypto.transactions.builder; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.arkecosystem.crypto.enums.HtlcLockExpirationType; import org.arkecosystem.crypto.transactions.Transaction; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertTrue; - public class HtlcLockTest { @Test void build() { - Transaction actual = new HtlcLock() - .amount(1) - .recipientId("AXoXnFi4z1Z6aFvjEYkDVCtBGW2PaRiM25") - .secretHash("0f128d401958b1b30ad0d10406f47f9489321017b4614e6cb993fc63913c5454") - .expirationType(HtlcLockExpirationType.EPOCH_TIMESTAMP, 1) - .nonce(3) - .sign("this is a top secret passphrase") - .transaction; + Transaction actual = + new HtlcLock() + .amount(1) + .recipientId("AXoXnFi4z1Z6aFvjEYkDVCtBGW2PaRiM25") + .secretHash( + "0f128d401958b1b30ad0d10406f47f9489321017b4614e6cb993fc63913c5454") + .expirationType(HtlcLockExpirationType.EPOCH_TIMESTAMP, 1) + .nonce(3) + .sign("this is a top secret passphrase") + .transaction; assertTrue(actual.verify()); } @Test void buildSecondSignature() { - Transaction actual = new HtlcLock() - .amount(1) - .recipientId("AXoXnFi4z1Z6aFvjEYkDVCtBGW2PaRiM25") - .secretHash("0f128d401958b1b30ad0d10406f47f9489321017b4614e6cb993fc63913c5454") - .expirationType(HtlcLockExpirationType.EPOCH_TIMESTAMP, 1) - .nonce(3) - .sign("this is a top secret passphrase") - .secondSign("this is a top secret second passphrase") - .transaction; + Transaction actual = + new HtlcLock() + .amount(1) + .recipientId("AXoXnFi4z1Z6aFvjEYkDVCtBGW2PaRiM25") + .secretHash( + "0f128d401958b1b30ad0d10406f47f9489321017b4614e6cb993fc63913c5454") + .expirationType(HtlcLockExpirationType.EPOCH_TIMESTAMP, 1) + .nonce(3) + .sign("this is a top secret passphrase") + .secondSign("this is a top secret second passphrase") + .transaction; assertTrue(actual.verify()); - assertTrue(actual.secondVerify("03699e966b2525f9088a6941d8d94f7869964a000efe65783d78ac82e1199fe609")); + assertTrue( + actual.secondVerify( + "03699e966b2525f9088a6941d8d94f7869964a000efe65783d78ac82e1199fe609")); } } diff --git a/src/test/java/org/arkecosystem/crypto/transactions/builder/HtlcRefundTest.java b/src/test/java/org/arkecosystem/crypto/transactions/builder/HtlcRefundTest.java index 3a66aa0c..f9c603a8 100644 --- a/src/test/java/org/arkecosystem/crypto/transactions/builder/HtlcRefundTest.java +++ b/src/test/java/org/arkecosystem/crypto/transactions/builder/HtlcRefundTest.java @@ -1,33 +1,38 @@ package org.arkecosystem.crypto.transactions.builder; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.arkecosystem.crypto.transactions.Transaction; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertTrue; - public class HtlcRefundTest { @Test void build() { - Transaction actual = new HtlcRefund() - .htlcRefundAsset("943c220691e711c39c79d437ce185748a0018940e1a4144293af9d05627d2eb4") - .nonce(3) - .sign("this is a top secret passphrase") - .transaction; + Transaction actual = + new HtlcRefund() + .htlcRefundAsset( + "943c220691e711c39c79d437ce185748a0018940e1a4144293af9d05627d2eb4") + .nonce(3) + .sign("this is a top secret passphrase") + .transaction; assertTrue(actual.verify()); } @Test void buildSecondSignature() { - Transaction actual = new HtlcRefund() - .htlcRefundAsset("943c220691e711c39c79d437ce185748a0018940e1a4144293af9d05627d2eb4") - .nonce(3) - .sign("this is a top secret passphrase") - .secondSign("this is a top secret second passphrase") - .transaction; + Transaction actual = + new HtlcRefund() + .htlcRefundAsset( + "943c220691e711c39c79d437ce185748a0018940e1a4144293af9d05627d2eb4") + .nonce(3) + .sign("this is a top secret passphrase") + .secondSign("this is a top secret second passphrase") + .transaction; assertTrue(actual.verify()); - assertTrue(actual.secondVerify("03699e966b2525f9088a6941d8d94f7869964a000efe65783d78ac82e1199fe609")); + assertTrue( + actual.secondVerify( + "03699e966b2525f9088a6941d8d94f7869964a000efe65783d78ac82e1199fe609")); } - } diff --git a/src/test/java/org/arkecosystem/crypto/transactions/builder/IpfsTest.java b/src/test/java/org/arkecosystem/crypto/transactions/builder/IpfsTest.java index 3db2ea30..0be28596 100644 --- a/src/test/java/org/arkecosystem/crypto/transactions/builder/IpfsTest.java +++ b/src/test/java/org/arkecosystem/crypto/transactions/builder/IpfsTest.java @@ -1,35 +1,39 @@ package org.arkecosystem.crypto.transactions.builder; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.arkecosystem.crypto.transactions.Transaction; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertTrue; - public class IpfsTest { @Test void build() { - Transaction actualV2 = new Ipfs() - .ipfsAsset("QmR45FmbVVrixReBwJkhEKde2qwHYaQzGxu4ZoDeswuF9w") - .version(2) - .nonce(3) - .sign("this is a top secret passphrase") - .transaction; + Transaction actualV2 = + new Ipfs() + .ipfsAsset("QmR45FmbVVrixReBwJkhEKde2qwHYaQzGxu4ZoDeswuF9w") + .version(2) + .nonce(3) + .sign("this is a top secret passphrase") + .transaction; assertTrue(actualV2.verify()); } @Test void buildSecondSignature() { - Transaction actualV2 = new Ipfs() - .ipfsAsset("QmR45FmbVVrixReBwJkhEKde2qwHYaQzGxu4ZoDeswuF9w") - .version(2) - .nonce(3) - .sign("this is a top secret passphrase") - .secondSign("this is a top secret second passphrase") - .transaction; + Transaction actualV2 = + new Ipfs() + .ipfsAsset("QmR45FmbVVrixReBwJkhEKde2qwHYaQzGxu4ZoDeswuF9w") + .version(2) + .nonce(3) + .sign("this is a top secret passphrase") + .secondSign("this is a top secret second passphrase") + .transaction; assertTrue(actualV2.verify()); - assertTrue(actualV2.secondVerify("03699e966b2525f9088a6941d8d94f7869964a000efe65783d78ac82e1199fe609")); + assertTrue( + actualV2.secondVerify( + "03699e966b2525f9088a6941d8d94f7869964a000efe65783d78ac82e1199fe609")); } } diff --git a/src/test/java/org/arkecosystem/crypto/transactions/builder/MultiPaymentTest.java b/src/test/java/org/arkecosystem/crypto/transactions/builder/MultiPaymentTest.java index 27807391..9f13e08a 100644 --- a/src/test/java/org/arkecosystem/crypto/transactions/builder/MultiPaymentTest.java +++ b/src/test/java/org/arkecosystem/crypto/transactions/builder/MultiPaymentTest.java @@ -1,38 +1,37 @@ package org.arkecosystem.crypto.transactions.builder; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.arkecosystem.crypto.transactions.Transaction; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertTrue; - public class MultiPaymentTest { @Test void build() { - Transaction actual = new MultiPayment() - .addPayment("AXoXnFi4z1Z6aFvjEYkDVCtBGW2PaRiM25",1) - .addPayment("AXoXnFi4z1Z6aFvjEYkDVCtBGW2PaRiM25",2) - .addPayment("AXoXnFi4z1Z6aFvjEYkDVCtBGW2PaRiM25",3) - .vendorField("This is a transaction from Java") - .sign("this is a top secret passphrase") - .transaction; + Transaction actual = + new MultiPayment() + .addPayment("AXoXnFi4z1Z6aFvjEYkDVCtBGW2PaRiM25", 1) + .addPayment("AXoXnFi4z1Z6aFvjEYkDVCtBGW2PaRiM25", 2) + .addPayment("AXoXnFi4z1Z6aFvjEYkDVCtBGW2PaRiM25", 3) + .vendorField("This is a transaction from Java") + .sign("this is a top secret passphrase") + .transaction; assertTrue(actual.verify()); - } - @Test void buildSecondSignature() { - Transaction actual = new MultiPayment() - .addPayment("AXoXnFi4z1Z6aFvjEYkDVCtBGW2PaRiM25",1) - .addPayment("AXoXnFi4z1Z6aFvjEYkDVCtBGW2PaRiM25",2) - .addPayment("AXoXnFi4z1Z6aFvjEYkDVCtBGW2PaRiM25",3) - .vendorField("This is a transaction from Java") - .sign("this is a top secret passphrase") - .secondSign("this is a top secret second passphrase") - .transaction; + Transaction actual = + new MultiPayment() + .addPayment("AXoXnFi4z1Z6aFvjEYkDVCtBGW2PaRiM25", 1) + .addPayment("AXoXnFi4z1Z6aFvjEYkDVCtBGW2PaRiM25", 2) + .addPayment("AXoXnFi4z1Z6aFvjEYkDVCtBGW2PaRiM25", 3) + .vendorField("This is a transaction from Java") + .sign("this is a top secret passphrase") + .secondSign("this is a top secret second passphrase") + .transaction; assertTrue(actual.verify()); - } } diff --git a/src/test/java/org/arkecosystem/crypto/transactions/builder/MultiSignatureRegistrationTest.java b/src/test/java/org/arkecosystem/crypto/transactions/builder/MultiSignatureRegistrationTest.java index c0160440..2c141819 100644 --- a/src/test/java/org/arkecosystem/crypto/transactions/builder/MultiSignatureRegistrationTest.java +++ b/src/test/java/org/arkecosystem/crypto/transactions/builder/MultiSignatureRegistrationTest.java @@ -1,46 +1,48 @@ package org.arkecosystem.crypto.transactions.builder; -import org.arkecosystem.crypto.transactions.Transaction; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; - -import static org.junit.jupiter.api.Assertions.assertTrue; +import org.arkecosystem.crypto.transactions.Transaction; +import org.junit.jupiter.api.Test; public class MultiSignatureRegistrationTest { @Test void build() { - Transaction actualV1 = new MultiSignatureRegistration() - .min(2) - .lifetime(255) - .keysgroup(Arrays.asList( - "03a02b9d5fdd1307c2ee4652ba54d492d1fd11a7d1bb3f3a44c4a05e79f19de933", - "13a02b9d5fdd1307c2ee4652ba54d492d1fd11a7d1bb3f3a44c4a05e79f19de933", - "23a02b9d5fdd1307c2ee4652ba54d492d1fd11a7d1bb3f3a44c4a05e79f19de933")) - .sign("this is a top secret passphrase") - .transaction; + Transaction actualV1 = + new MultiSignatureRegistration() + .min(2) + .lifetime(255) + .keysgroup( + Arrays.asList( + "03a02b9d5fdd1307c2ee4652ba54d492d1fd11a7d1bb3f3a44c4a05e79f19de933", + "13a02b9d5fdd1307c2ee4652ba54d492d1fd11a7d1bb3f3a44c4a05e79f19de933", + "23a02b9d5fdd1307c2ee4652ba54d492d1fd11a7d1bb3f3a44c4a05e79f19de933")) + .sign("this is a top secret passphrase") + .transaction; assertTrue(actualV1.verify()); - } @Test void buildSecondSignature() { - Transaction actual = new MultiSignatureRegistration() - .min(2) - .lifetime(255) - .keysgroup(Arrays.asList( - "03a02b9d5fdd1307c2ee4652ba54d492d1fd11a7d1bb3f3a44c4a05e79f19de933", - "13a02b9d5fdd1307c2ee4652ba54d492d1fd11a7d1bb3f3a44c4a05e79f19de933", - "23a02b9d5fdd1307c2ee4652ba54d492d1fd11a7d1bb3f3a44c4a05e79f19de933")) - .sign("this is a top secret passphrase") - .secondSign("this is a top secret second passphrase") - .transaction; + Transaction actual = + new MultiSignatureRegistration() + .min(2) + .lifetime(255) + .keysgroup( + Arrays.asList( + "03a02b9d5fdd1307c2ee4652ba54d492d1fd11a7d1bb3f3a44c4a05e79f19de933", + "13a02b9d5fdd1307c2ee4652ba54d492d1fd11a7d1bb3f3a44c4a05e79f19de933", + "23a02b9d5fdd1307c2ee4652ba54d492d1fd11a7d1bb3f3a44c4a05e79f19de933")) + .sign("this is a top secret passphrase") + .secondSign("this is a top secret second passphrase") + .transaction; assertTrue(actual.verify()); - assertTrue(actual.secondVerify("03699e966b2525f9088a6941d8d94f7869964a000efe65783d78ac82e1199fe609")); - + assertTrue( + actual.secondVerify( + "03699e966b2525f9088a6941d8d94f7869964a000efe65783d78ac82e1199fe609")); } - } diff --git a/src/test/java/org/arkecosystem/crypto/transactions/builder/SecondSignatureRegistrationTest.java b/src/test/java/org/arkecosystem/crypto/transactions/builder/SecondSignatureRegistrationTest.java index 39fff70b..f4f89d62 100644 --- a/src/test/java/org/arkecosystem/crypto/transactions/builder/SecondSignatureRegistrationTest.java +++ b/src/test/java/org/arkecosystem/crypto/transactions/builder/SecondSignatureRegistrationTest.java @@ -1,30 +1,31 @@ package org.arkecosystem.crypto.transactions.builder; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.arkecosystem.crypto.transactions.Transaction; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertTrue; - public class SecondSignatureRegistrationTest { @Test void build() { - Transaction actualV1 = new SecondSignatureRegistration() - .signature("this is a top secret second passphrase'") - .version(1) - .sign("this is a top secret passphrase") - .transaction; + Transaction actualV1 = + new SecondSignatureRegistration() + .signature("this is a top secret second passphrase'") + .version(1) + .sign("this is a top secret passphrase") + .transaction; assertTrue(actualV1.verify()); - Transaction actualV2 = new SecondSignatureRegistration() - .signature("this is a top secret second passphrase'") - .version(2) - .nonce(3) - .sign("this is a top secret passphrase") - .transaction; + Transaction actualV2 = + new SecondSignatureRegistration() + .signature("this is a top secret second passphrase'") + .version(2) + .nonce(3) + .sign("this is a top secret passphrase") + .transaction; assertTrue(actualV2.verify()); } - } diff --git a/src/test/java/org/arkecosystem/crypto/transactions/builder/TransferTest.java b/src/test/java/org/arkecosystem/crypto/transactions/builder/TransferTest.java index 631fcdb9..f5f3ade8 100644 --- a/src/test/java/org/arkecosystem/crypto/transactions/builder/TransferTest.java +++ b/src/test/java/org/arkecosystem/crypto/transactions/builder/TransferTest.java @@ -1,62 +1,69 @@ package org.arkecosystem.crypto.transactions.builder; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.arkecosystem.crypto.transactions.Transaction; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertTrue; - public class TransferTest { @Test void build() { - Transaction actualV1 = new Transfer() - .recipient("AXoXnFi4z1Z6aFvjEYkDVCtBGW2PaRiM25") - .amount(133380000000L) - .vendorField("This is a transaction from Java") - .version(1) - .sign("this is a top secret passphrase") - .transaction; + Transaction actualV1 = + new Transfer() + .recipient("AXoXnFi4z1Z6aFvjEYkDVCtBGW2PaRiM25") + .amount(133380000000L) + .vendorField("This is a transaction from Java") + .version(1) + .sign("this is a top secret passphrase") + .transaction; assertTrue(actualV1.verify()); - Transaction actualV2 = new Transfer() - .recipient("AXoXnFi4z1Z6aFvjEYkDVCtBGW2PaRiM25") - .amount(133380000000L) - .vendorField("This is a transaction from Java") - .version(2) - .nonce(3) - .sign("this is a top secret passphrase") - .transaction; + Transaction actualV2 = + new Transfer() + .recipient("AXoXnFi4z1Z6aFvjEYkDVCtBGW2PaRiM25") + .amount(133380000000L) + .vendorField("This is a transaction from Java") + .version(2) + .nonce(3) + .sign("this is a top secret passphrase") + .transaction; assertTrue(actualV2.verify()); } @Test void buildSecondSignature() { - Transaction actualV1 = new Transfer() - .recipient("AXoXnFi4z1Z6aFvjEYkDVCtBGW2PaRiM25") - .amount(133380000000L) - .vendorField("This is a transaction from Java") - .version(1) - .sign("this is a top secret passphrase") - .secondSign("this is a top secret second passphrase") - .transaction; + Transaction actualV1 = + new Transfer() + .recipient("AXoXnFi4z1Z6aFvjEYkDVCtBGW2PaRiM25") + .amount(133380000000L) + .vendorField("This is a transaction from Java") + .version(1) + .sign("this is a top secret passphrase") + .secondSign("this is a top secret second passphrase") + .transaction; assertTrue(actualV1.verify()); - assertTrue(actualV1.secondVerify("03699e966b2525f9088a6941d8d94f7869964a000efe65783d78ac82e1199fe609")); - - Transaction actualV2 = new Transfer() - .recipient("AXoXnFi4z1Z6aFvjEYkDVCtBGW2PaRiM25") - .amount(133380000000L) - .vendorField("This is a transaction from Java") - .version(2) - .nonce(3) - .sign("this is a top secret passphrase") - .secondSign("this is a top secret second passphrase") - .transaction; + assertTrue( + actualV1.secondVerify( + "03699e966b2525f9088a6941d8d94f7869964a000efe65783d78ac82e1199fe609")); + + Transaction actualV2 = + new Transfer() + .recipient("AXoXnFi4z1Z6aFvjEYkDVCtBGW2PaRiM25") + .amount(133380000000L) + .vendorField("This is a transaction from Java") + .version(2) + .nonce(3) + .sign("this is a top secret passphrase") + .secondSign("this is a top secret second passphrase") + .transaction; assertTrue(actualV2.verify()); - assertTrue(actualV2.secondVerify("03699e966b2525f9088a6941d8d94f7869964a000efe65783d78ac82e1199fe609")); + assertTrue( + actualV2.secondVerify( + "03699e966b2525f9088a6941d8d94f7869964a000efe65783d78ac82e1199fe609")); } - } diff --git a/src/test/java/org/arkecosystem/crypto/transactions/builder/VoteTest.java b/src/test/java/org/arkecosystem/crypto/transactions/builder/VoteTest.java index 258a6f33..abe2410e 100644 --- a/src/test/java/org/arkecosystem/crypto/transactions/builder/VoteTest.java +++ b/src/test/java/org/arkecosystem/crypto/transactions/builder/VoteTest.java @@ -1,58 +1,70 @@ package org.arkecosystem.crypto.transactions.builder; -import org.arkecosystem.crypto.transactions.Transaction; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; - -import static org.junit.jupiter.api.Assertions.assertTrue; +import org.arkecosystem.crypto.transactions.Transaction; +import org.junit.jupiter.api.Test; public class VoteTest { - @Test void build() { - Transaction actualV1 = new Vote() - .votes(Arrays.asList("'+034151a3ec46b5670a682b0a63394f863587d1bc97483b1b6c70eb58e7f0aed192'")) - .version(1) - .sign("this is a top secret passphrase") - .transaction; + Transaction actualV1 = + new Vote() + .votes( + Arrays.asList( + "'+034151a3ec46b5670a682b0a63394f863587d1bc97483b1b6c70eb58e7f0aed192'")) + .version(1) + .sign("this is a top secret passphrase") + .transaction; assertTrue(actualV1.verify()); - Transaction actualV2 = new Vote() - .votes(Arrays.asList("+034151a3ec46b5670a682b0a63394f863587d1bc97483b1b6c70eb58e7f0aed192")) - .version(2) - .nonce(3) - .sign("this is a top secret passphrase") - .transaction; + Transaction actualV2 = + new Vote() + .votes( + Arrays.asList( + "+034151a3ec46b5670a682b0a63394f863587d1bc97483b1b6c70eb58e7f0aed192")) + .version(2) + .nonce(3) + .sign("this is a top secret passphrase") + .transaction; assertTrue(actualV2.verify()); } @Test void buildSecondSignature() { - Transaction actualV1 = new Vote() - .votes(Arrays.asList("'+034151a3ec46b5670a682b0a63394f863587d1bc97483b1b6c70eb58e7f0aed192'")) - .version(1) - .sign("this is a top secret passphrase") - .secondSign("this is a top secret second passphrase") - .transaction; + Transaction actualV1 = + new Vote() + .votes( + Arrays.asList( + "'+034151a3ec46b5670a682b0a63394f863587d1bc97483b1b6c70eb58e7f0aed192'")) + .version(1) + .sign("this is a top secret passphrase") + .secondSign("this is a top secret second passphrase") + .transaction; assertTrue(actualV1.verify()); - assertTrue(actualV1.secondVerify("03699e966b2525f9088a6941d8d94f7869964a000efe65783d78ac82e1199fe609")); + assertTrue( + actualV1.secondVerify( + "03699e966b2525f9088a6941d8d94f7869964a000efe65783d78ac82e1199fe609")); - - Transaction actualV2 = new Vote() - .votes(Arrays.asList("+034151a3ec46b5670a682b0a63394f863587d1bc97483b1b6c70eb58e7f0aed192")) - .version(2) - .nonce(3) - .sign("this is a top secret passphrase") - .secondSign("this is a top secret second passphrase") - .transaction; + Transaction actualV2 = + new Vote() + .votes( + Arrays.asList( + "+034151a3ec46b5670a682b0a63394f863587d1bc97483b1b6c70eb58e7f0aed192")) + .version(2) + .nonce(3) + .sign("this is a top secret passphrase") + .secondSign("this is a top secret second passphrase") + .transaction; assertTrue(actualV2.verify()); - assertTrue(actualV2.secondVerify("03699e966b2525f9088a6941d8d94f7869964a000efe65783d78ac82e1199fe609")); + assertTrue( + actualV2.secondVerify( + "03699e966b2525f9088a6941d8d94f7869964a000efe65783d78ac82e1199fe609")); } - } diff --git a/src/test/java/org/arkecosystem/crypto/transactions/deserializers/DelegateRegistrationTest.java b/src/test/java/org/arkecosystem/crypto/transactions/deserializers/DelegateRegistrationTest.java index cec2942f..552fa0b7 100644 --- a/src/test/java/org/arkecosystem/crypto/transactions/deserializers/DelegateRegistrationTest.java +++ b/src/test/java/org/arkecosystem/crypto/transactions/deserializers/DelegateRegistrationTest.java @@ -1,5 +1,7 @@ package org.arkecosystem.crypto.transactions.deserializers; +import static org.junit.jupiter.api.Assertions.assertEquals; + import com.google.gson.internal.LinkedTreeMap; import org.arkecosystem.crypto.enums.TransactionTypeGroup; import org.arkecosystem.crypto.transactions.Deserializer; @@ -7,17 +9,18 @@ import org.arkecosystem.crypto.transactions.Transaction; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; - class DelegateRegistrationTest { @Test void passphrase() { // V1 tests - LinkedTreeMap fixtureV1 = FixtureLoader.load("transactions/V1/delegate_registration/passphrase"); - LinkedTreeMap dataV1 = (LinkedTreeMap) fixtureV1.get("data"); + LinkedTreeMap fixtureV1 = + FixtureLoader.load("transactions/V1/delegate_registration/passphrase"); + LinkedTreeMap dataV1 = + (LinkedTreeMap) fixtureV1.get("data"); - Transaction actualV1 = new Deserializer().deserialize(fixtureV1.get("serialized").toString()); + Transaction actualV1 = + new Deserializer().deserialize(fixtureV1.get("serialized").toString()); assertEquals(((Double) dataV1.get("type")).intValue(), actualV1.type); assertEquals(((Double) dataV1.get("amount")).longValue(), actualV1.amount); assertEquals(((Double) dataV1.get("fee")).longValue(), actualV1.fee); @@ -26,15 +29,19 @@ void passphrase() { assertEquals(dataV1.get("signature").toString(), actualV1.signature); assertEquals(dataV1.get("id").toString(), actualV1.id); - LinkedTreeMap assetV1 = (LinkedTreeMap) ((LinkedTreeMap) dataV1.get("asset")).get("delegate"); + LinkedTreeMap assetV1 = + (LinkedTreeMap) + ((LinkedTreeMap) dataV1.get("asset")).get("delegate"); assertEquals((assetV1.get("username")), actualV1.asset.delegate.username); - // V2 tests - LinkedTreeMap fixtureV2 = FixtureLoader.load("transactions/V2/delegate_registration/passphrase"); - LinkedTreeMap dataV2 = (LinkedTreeMap) fixtureV2.get("data"); + LinkedTreeMap fixtureV2 = + FixtureLoader.load("transactions/V2/delegate_registration/passphrase"); + LinkedTreeMap dataV2 = + (LinkedTreeMap) fixtureV2.get("data"); - Transaction actualV2 = new Deserializer().deserialize(fixtureV2.get("serialized").toString()); + Transaction actualV2 = + new Deserializer().deserialize(fixtureV2.get("serialized").toString()); assertEquals(((Double) dataV2.get("type")).intValue(), actualV2.type); assertEquals(TransactionTypeGroup.CORE.getValue(), actualV2.typeGroup); assertEquals((Long.valueOf((String) dataV2.get("fee"))), actualV2.fee); @@ -43,17 +50,22 @@ void passphrase() { assertEquals(dataV2.get("signature").toString(), actualV2.signature); assertEquals(dataV2.get("id").toString(), actualV2.id); - LinkedTreeMap assetV2 = (LinkedTreeMap) ((LinkedTreeMap) dataV2.get("asset")).get("delegate"); + LinkedTreeMap assetV2 = + (LinkedTreeMap) + ((LinkedTreeMap) dataV2.get("asset")).get("delegate"); assertEquals((assetV2.get("username")), actualV2.asset.delegate.username); } @Test void secondPassphrase() { // V1 tests - LinkedTreeMap fixtureV1 = FixtureLoader.load("transactions/V1/delegate_registration/second-passphrase"); - LinkedTreeMap dataV1 = (LinkedTreeMap) fixtureV1.get("data"); + LinkedTreeMap fixtureV1 = + FixtureLoader.load("transactions/V1/delegate_registration/second-passphrase"); + LinkedTreeMap dataV1 = + (LinkedTreeMap) fixtureV1.get("data"); - Transaction actualV1 = new Deserializer().deserialize(fixtureV1.get("serialized").toString()); + Transaction actualV1 = + new Deserializer().deserialize(fixtureV1.get("serialized").toString()); assertEquals(((Double) dataV1.get("type")).intValue(), actualV1.type); assertEquals(((Double) dataV1.get("amount")).longValue(), actualV1.amount); assertEquals(((Double) dataV1.get("fee")).longValue(), actualV1.fee); @@ -63,16 +75,19 @@ void secondPassphrase() { assertEquals(dataV1.get("signSignature").toString(), actualV1.signSignature); assertEquals(dataV1.get("id").toString(), actualV1.id); - LinkedTreeMap assetV1 = (LinkedTreeMap) ((LinkedTreeMap) dataV1.get("asset")).get("delegate"); + LinkedTreeMap assetV1 = + (LinkedTreeMap) + ((LinkedTreeMap) dataV1.get("asset")).get("delegate"); assertEquals((assetV1.get("username")), actualV1.asset.delegate.username); - - // V2 tests - LinkedTreeMap fixtureV2 = FixtureLoader.load("transactions/V2/delegate_registration/second-passphrase"); - LinkedTreeMap dataV2 = (LinkedTreeMap) fixtureV2.get("data"); + LinkedTreeMap fixtureV2 = + FixtureLoader.load("transactions/V2/delegate_registration/second-passphrase"); + LinkedTreeMap dataV2 = + (LinkedTreeMap) fixtureV2.get("data"); - Transaction actualV2 = new Deserializer().deserialize(fixtureV2.get("serialized").toString()); + Transaction actualV2 = + new Deserializer().deserialize(fixtureV2.get("serialized").toString()); assertEquals(((Double) dataV2.get("type")).intValue(), actualV2.type); assertEquals(TransactionTypeGroup.CORE.getValue(), actualV2.typeGroup); assertEquals((Long.valueOf((String) dataV2.get("fee"))), actualV2.fee); @@ -83,8 +98,9 @@ void secondPassphrase() { assertEquals(dataV2.get("secondSignature").toString(), actualV2.secondSignature); assertEquals(dataV2.get("id").toString(), actualV2.id); - LinkedTreeMap assetV2 = (LinkedTreeMap) ((LinkedTreeMap) dataV2.get("asset")).get("delegate"); + LinkedTreeMap assetV2 = + (LinkedTreeMap) + ((LinkedTreeMap) dataV2.get("asset")).get("delegate"); assertEquals((assetV2.get("username")), actualV2.asset.delegate.username); } - } diff --git a/src/test/java/org/arkecosystem/crypto/transactions/deserializers/DelegateResignationTest.java b/src/test/java/org/arkecosystem/crypto/transactions/deserializers/DelegateResignationTest.java index c5ab4bea..52e9743a 100644 --- a/src/test/java/org/arkecosystem/crypto/transactions/deserializers/DelegateResignationTest.java +++ b/src/test/java/org/arkecosystem/crypto/transactions/deserializers/DelegateResignationTest.java @@ -1,5 +1,8 @@ package org.arkecosystem.crypto.transactions.deserializers; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; + import com.google.gson.internal.LinkedTreeMap; import org.arkecosystem.crypto.enums.TransactionTypeGroup; import org.arkecosystem.crypto.transactions.Deserializer; @@ -7,14 +10,12 @@ import org.arkecosystem.crypto.transactions.Transaction; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; - public class DelegateResignationTest { @Test void passphrase() { - LinkedTreeMap fixture = FixtureLoader.load("transactions/V2/delegate_resignation/passphrase"); + LinkedTreeMap fixture = + FixtureLoader.load("transactions/V2/delegate_resignation/passphrase"); LinkedTreeMap data = (LinkedTreeMap) fixture.get("data"); Transaction actual = new Deserializer().deserialize(fixture.get("serialized").toString()); @@ -27,12 +28,12 @@ void passphrase() { assertEquals(data.get("id").toString(), actual.id); assertNull(data.get("asset")); - } @Test void secondPassphrase() { - LinkedTreeMap fixture = FixtureLoader.load("transactions/V2/delegate_resignation/second-passphrase"); + LinkedTreeMap fixture = + FixtureLoader.load("transactions/V2/delegate_resignation/second-passphrase"); LinkedTreeMap data = (LinkedTreeMap) fixture.get("data"); Transaction actual = new Deserializer().deserialize(fixture.get("serialized").toString()); @@ -47,6 +48,5 @@ void secondPassphrase() { assertEquals(data.get("id").toString(), actual.id); assertNull(data.get("asset")); - } } diff --git a/src/test/java/org/arkecosystem/crypto/transactions/deserializers/HtlcClaimTest.java b/src/test/java/org/arkecosystem/crypto/transactions/deserializers/HtlcClaimTest.java index 01c845eb..d2bca557 100644 --- a/src/test/java/org/arkecosystem/crypto/transactions/deserializers/HtlcClaimTest.java +++ b/src/test/java/org/arkecosystem/crypto/transactions/deserializers/HtlcClaimTest.java @@ -1,5 +1,7 @@ package org.arkecosystem.crypto.transactions.deserializers; +import static org.junit.jupiter.api.Assertions.assertEquals; + import com.google.gson.internal.LinkedTreeMap; import org.arkecosystem.crypto.enums.TransactionTypeGroup; import org.arkecosystem.crypto.transactions.Deserializer; @@ -7,12 +9,11 @@ import org.arkecosystem.crypto.transactions.Transaction; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; - public class HtlcClaimTest { @Test void passphrase() { - LinkedTreeMap fixture = FixtureLoader.load("transactions/V2/htlc-claim/passphrase"); + LinkedTreeMap fixture = + FixtureLoader.load("transactions/V2/htlc-claim/passphrase"); LinkedTreeMap data = (LinkedTreeMap) fixture.get("data"); Transaction actual = new Deserializer().deserialize(fixture.get("serialized").toString()); @@ -23,17 +24,20 @@ void passphrase() { assertEquals(data.get("senderPublicKey").toString(), actual.senderPublicKey); assertEquals(data.get("signature").toString(), actual.signature); - LinkedTreeMap asset = (LinkedTreeMap) ((LinkedTreeMap) data.get("asset")).get("claim"); - assertEquals((asset.get("lockTransactionId")), actual.asset.htlcClaimAsset.lockTransactionId); + LinkedTreeMap asset = + (LinkedTreeMap) + ((LinkedTreeMap) data.get("asset")).get("claim"); + assertEquals( + (asset.get("lockTransactionId")), actual.asset.htlcClaimAsset.lockTransactionId); assertEquals((asset.get("unlockSecret")), actual.asset.htlcClaimAsset.unlockSecret); assertEquals(data.get("id").toString(), actual.id); - } @Test void secondPassphrase() { - LinkedTreeMap fixture = FixtureLoader.load("transactions/V2/htlc-claim/second-passphrase"); + LinkedTreeMap fixture = + FixtureLoader.load("transactions/V2/htlc-claim/second-passphrase"); LinkedTreeMap data = (LinkedTreeMap) fixture.get("data"); Transaction actual = new Deserializer().deserialize(fixture.get("serialized").toString()); @@ -46,12 +50,13 @@ void secondPassphrase() { assertEquals(data.get("secondSignature").toString(), actual.signSignature); assertEquals(data.get("secondSignature").toString(), actual.secondSignature); - LinkedTreeMap asset = (LinkedTreeMap) ((LinkedTreeMap) data.get("asset")).get("claim"); - assertEquals((asset.get("lockTransactionId")), actual.asset.htlcClaimAsset.lockTransactionId); + LinkedTreeMap asset = + (LinkedTreeMap) + ((LinkedTreeMap) data.get("asset")).get("claim"); + assertEquals( + (asset.get("lockTransactionId")), actual.asset.htlcClaimAsset.lockTransactionId); assertEquals((asset.get("unlockSecret")), actual.asset.htlcClaimAsset.unlockSecret); assertEquals(data.get("id").toString(), actual.id); - } - } diff --git a/src/test/java/org/arkecosystem/crypto/transactions/deserializers/HtlcLockTest.java b/src/test/java/org/arkecosystem/crypto/transactions/deserializers/HtlcLockTest.java index ab763914..9822e362 100644 --- a/src/test/java/org/arkecosystem/crypto/transactions/deserializers/HtlcLockTest.java +++ b/src/test/java/org/arkecosystem/crypto/transactions/deserializers/HtlcLockTest.java @@ -1,5 +1,7 @@ package org.arkecosystem.crypto.transactions.deserializers; +import static org.junit.jupiter.api.Assertions.assertEquals; + import com.google.gson.internal.LinkedTreeMap; import org.arkecosystem.crypto.enums.TransactionTypeGroup; import org.arkecosystem.crypto.transactions.Deserializer; @@ -7,12 +9,11 @@ import org.arkecosystem.crypto.transactions.Transaction; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; - public class HtlcLockTest { @Test void passphrase() { - LinkedTreeMap fixture = FixtureLoader.load("transactions/V2/htlc-lock/passphrase"); + LinkedTreeMap fixture = + FixtureLoader.load("transactions/V2/htlc-lock/passphrase"); LinkedTreeMap data = (LinkedTreeMap) fixture.get("data"); Transaction actual = new Deserializer().deserialize(fixture.get("serialized").toString()); @@ -23,19 +24,27 @@ void passphrase() { assertEquals(data.get("senderPublicKey").toString(), actual.senderPublicKey); assertEquals(data.get("signature").toString(), actual.signature); - LinkedTreeMap asset = (LinkedTreeMap) ((LinkedTreeMap) data.get("asset")).get("lock"); + LinkedTreeMap asset = + (LinkedTreeMap) + ((LinkedTreeMap) data.get("asset")).get("lock"); assertEquals((asset.get("secretHash")), actual.asset.htlcLockAsset.secretHash); - LinkedTreeMap assetExpiration = (LinkedTreeMap) ((LinkedTreeMap) asset.get("expiration")); - assertEquals(((Double) assetExpiration.get("type")).intValue(), actual.asset.htlcLockAsset.expiration.type.getValue()); - assertEquals(((Double) assetExpiration.get("value")).intValue(), actual.asset.htlcLockAsset.expiration.value); + LinkedTreeMap assetExpiration = + (LinkedTreeMap) + ((LinkedTreeMap) asset.get("expiration")); + assertEquals( + ((Double) assetExpiration.get("type")).intValue(), + actual.asset.htlcLockAsset.expiration.type.getValue()); + assertEquals( + ((Double) assetExpiration.get("value")).intValue(), + actual.asset.htlcLockAsset.expiration.value); assertEquals(data.get("id").toString(), actual.id); - } @Test void secondPassphrase() { - LinkedTreeMap fixture = FixtureLoader.load("transactions/V2/htlc-lock/second-passphrase"); + LinkedTreeMap fixture = + FixtureLoader.load("transactions/V2/htlc-lock/second-passphrase"); LinkedTreeMap data = (LinkedTreeMap) fixture.get("data"); Transaction actual = new Deserializer().deserialize(fixture.get("serialized").toString()); @@ -48,14 +57,20 @@ void secondPassphrase() { assertEquals(data.get("secondSignature").toString(), actual.signSignature); assertEquals(data.get("secondSignature").toString(), actual.secondSignature); - LinkedTreeMap asset = (LinkedTreeMap) ((LinkedTreeMap) data.get("asset")).get("lock"); + LinkedTreeMap asset = + (LinkedTreeMap) + ((LinkedTreeMap) data.get("asset")).get("lock"); assertEquals((asset.get("secretHash")), actual.asset.htlcLockAsset.secretHash); - LinkedTreeMap assetExpiration = (LinkedTreeMap) ((LinkedTreeMap) asset.get("expiration")); - assertEquals(((Double) assetExpiration.get("type")).intValue(), actual.asset.htlcLockAsset.expiration.type.getValue()); - assertEquals(((Double) assetExpiration.get("value")).intValue(), actual.asset.htlcLockAsset.expiration.value); + LinkedTreeMap assetExpiration = + (LinkedTreeMap) + ((LinkedTreeMap) asset.get("expiration")); + assertEquals( + ((Double) assetExpiration.get("type")).intValue(), + actual.asset.htlcLockAsset.expiration.type.getValue()); + assertEquals( + ((Double) assetExpiration.get("value")).intValue(), + actual.asset.htlcLockAsset.expiration.value); assertEquals(data.get("id").toString(), actual.id); - - } } diff --git a/src/test/java/org/arkecosystem/crypto/transactions/deserializers/HtlcRefundTest.java b/src/test/java/org/arkecosystem/crypto/transactions/deserializers/HtlcRefundTest.java index a4ac8ca3..a925575a 100644 --- a/src/test/java/org/arkecosystem/crypto/transactions/deserializers/HtlcRefundTest.java +++ b/src/test/java/org/arkecosystem/crypto/transactions/deserializers/HtlcRefundTest.java @@ -1,5 +1,7 @@ package org.arkecosystem.crypto.transactions.deserializers; +import static org.junit.jupiter.api.Assertions.assertEquals; + import com.google.gson.internal.LinkedTreeMap; import org.arkecosystem.crypto.enums.TransactionTypeGroup; import org.arkecosystem.crypto.transactions.Deserializer; @@ -7,13 +9,12 @@ import org.arkecosystem.crypto.transactions.Transaction; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; - public class HtlcRefundTest { @Test void passphrase() { - LinkedTreeMap fixture = FixtureLoader.load("transactions/V2/htlc-refund/passphrase"); + LinkedTreeMap fixture = + FixtureLoader.load("transactions/V2/htlc-refund/passphrase"); LinkedTreeMap data = (LinkedTreeMap) fixture.get("data"); Transaction actual = new Deserializer().deserialize(fixture.get("serialized").toString()); @@ -24,16 +25,19 @@ void passphrase() { assertEquals(data.get("senderPublicKey").toString(), actual.senderPublicKey); assertEquals(data.get("signature").toString(), actual.signature); - LinkedTreeMap asset = (LinkedTreeMap) ((LinkedTreeMap) data.get("asset")).get("refund"); - assertEquals((asset.get("lockTransactionId")), actual.asset.htlcRefundAsset.lockTransactionId); + LinkedTreeMap asset = + (LinkedTreeMap) + ((LinkedTreeMap) data.get("asset")).get("refund"); + assertEquals( + (asset.get("lockTransactionId")), actual.asset.htlcRefundAsset.lockTransactionId); assertEquals(data.get("id").toString(), actual.id); - } @Test void secondPassphrase() { - LinkedTreeMap fixture = FixtureLoader.load("transactions/V2/htlc-refund/second-passphrase"); + LinkedTreeMap fixture = + FixtureLoader.load("transactions/V2/htlc-refund/second-passphrase"); LinkedTreeMap data = (LinkedTreeMap) fixture.get("data"); Transaction actual = new Deserializer().deserialize(fixture.get("serialized").toString()); @@ -46,10 +50,12 @@ void secondPassphrase() { assertEquals(data.get("secondSignature").toString(), actual.signSignature); assertEquals(data.get("secondSignature").toString(), actual.secondSignature); - LinkedTreeMap asset = (LinkedTreeMap) ((LinkedTreeMap) data.get("asset")).get("refund"); - assertEquals((asset.get("lockTransactionId")), actual.asset.htlcRefundAsset.lockTransactionId); + LinkedTreeMap asset = + (LinkedTreeMap) + ((LinkedTreeMap) data.get("asset")).get("refund"); + assertEquals( + (asset.get("lockTransactionId")), actual.asset.htlcRefundAsset.lockTransactionId); assertEquals(data.get("id").toString(), actual.id); - } } diff --git a/src/test/java/org/arkecosystem/crypto/transactions/deserializers/IpfsTest.java b/src/test/java/org/arkecosystem/crypto/transactions/deserializers/IpfsTest.java index 4795171b..8df0ff52 100644 --- a/src/test/java/org/arkecosystem/crypto/transactions/deserializers/IpfsTest.java +++ b/src/test/java/org/arkecosystem/crypto/transactions/deserializers/IpfsTest.java @@ -1,5 +1,7 @@ package org.arkecosystem.crypto.transactions.deserializers; +import static org.junit.jupiter.api.Assertions.assertEquals; + import com.google.gson.internal.LinkedTreeMap; import org.arkecosystem.crypto.enums.TransactionTypeGroup; import org.arkecosystem.crypto.transactions.Deserializer; @@ -7,13 +9,12 @@ import org.arkecosystem.crypto.transactions.Transaction; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; - public class IpfsTest { @Test void passphrase() { - LinkedTreeMap fixture = FixtureLoader.load("transactions/V2/ipfs/passphrase"); + LinkedTreeMap fixture = + FixtureLoader.load("transactions/V2/ipfs/passphrase"); LinkedTreeMap data = (LinkedTreeMap) fixture.get("data"); Transaction actual = new Deserializer().deserialize(fixture.get("serialized").toString()); @@ -31,7 +32,8 @@ void passphrase() { @Test void secondPassphrase() { - LinkedTreeMap fixture = FixtureLoader.load("transactions/V2/ipfs/second-passphrase"); + LinkedTreeMap fixture = + FixtureLoader.load("transactions/V2/ipfs/second-passphrase"); LinkedTreeMap data = (LinkedTreeMap) fixture.get("data"); Transaction actual = new Deserializer().deserialize(fixture.get("serialized").toString()); diff --git a/src/test/java/org/arkecosystem/crypto/transactions/deserializers/MultiPaymentTest.java b/src/test/java/org/arkecosystem/crypto/transactions/deserializers/MultiPaymentTest.java index 78701298..81287e34 100644 --- a/src/test/java/org/arkecosystem/crypto/transactions/deserializers/MultiPaymentTest.java +++ b/src/test/java/org/arkecosystem/crypto/transactions/deserializers/MultiPaymentTest.java @@ -1,20 +1,20 @@ package org.arkecosystem.crypto.transactions.deserializers; +import static org.junit.jupiter.api.Assertions.assertEquals; + import com.google.gson.internal.LinkedTreeMap; +import java.util.ArrayList; import org.arkecosystem.crypto.enums.TransactionTypeGroup; import org.arkecosystem.crypto.transactions.Deserializer; import org.arkecosystem.crypto.transactions.FixtureLoader; import org.arkecosystem.crypto.transactions.Transaction; import org.junit.jupiter.api.Test; -import java.util.ArrayList; - -import static org.junit.jupiter.api.Assertions.assertEquals; - public class MultiPaymentTest { @Test void passphrase() { - LinkedTreeMap fixture = FixtureLoader.load("transactions/V2/multi_payment/passphrase"); + LinkedTreeMap fixture = + FixtureLoader.load("transactions/V2/multi_payment/passphrase"); LinkedTreeMap data = (LinkedTreeMap) fixture.get("data"); Transaction actual = new Deserializer().deserialize(fixture.get("serialized").toString()); @@ -27,18 +27,21 @@ void passphrase() { assertEquals(data.get("id").toString(), actual.id); LinkedTreeMap asset = (LinkedTreeMap) data.get("asset"); - ArrayList payments = ((ArrayList)asset.get("payments")); - for (int i = 0; i < payments.size(); i++){ - String recipientId = (String)((LinkedTreeMap)payments.get(i)).get("recipientId"); - String amount = ((String)((LinkedTreeMap)payments.get(i)).get("amount")); - assertEquals(recipientId,actual.asset.multiPayment.payments.get(i).recipientId); - assertEquals(Long.valueOf(amount),actual.asset.multiPayment.payments.get(i).amount); + ArrayList payments = ((ArrayList) asset.get("payments")); + for (int i = 0; i < payments.size(); i++) { + String recipientId = + (String) ((LinkedTreeMap) payments.get(i)).get("recipientId"); + String amount = + ((String) ((LinkedTreeMap) payments.get(i)).get("amount")); + assertEquals(recipientId, actual.asset.multiPayment.payments.get(i).recipientId); + assertEquals(Long.valueOf(amount), actual.asset.multiPayment.payments.get(i).amount); } } @Test void secondPassphrase() { - LinkedTreeMap fixture = FixtureLoader.load("transactions/V2/multi_payment/second-passphrase"); + LinkedTreeMap fixture = + FixtureLoader.load("transactions/V2/multi_payment/second-passphrase"); LinkedTreeMap data = (LinkedTreeMap) fixture.get("data"); Transaction actual = new Deserializer().deserialize(fixture.get("serialized").toString()); @@ -53,12 +56,14 @@ void secondPassphrase() { assertEquals(data.get("id").toString(), actual.id); LinkedTreeMap asset = (LinkedTreeMap) data.get("asset"); - ArrayList payments = ((ArrayList)asset.get("payments")); - for (int i = 0; i < payments.size(); i++){ - String recipientId = (String)((LinkedTreeMap)payments.get(i)).get("recipientId"); - String amount = ((String)((LinkedTreeMap)payments.get(i)).get("amount")); - assertEquals(recipientId,actual.asset.multiPayment.payments.get(i).recipientId); - assertEquals(Long.valueOf(amount),actual.asset.multiPayment.payments.get(i).amount); + ArrayList payments = ((ArrayList) asset.get("payments")); + for (int i = 0; i < payments.size(); i++) { + String recipientId = + (String) ((LinkedTreeMap) payments.get(i)).get("recipientId"); + String amount = + ((String) ((LinkedTreeMap) payments.get(i)).get("amount")); + assertEquals(recipientId, actual.asset.multiPayment.payments.get(i).recipientId); + assertEquals(Long.valueOf(amount), actual.asset.multiPayment.payments.get(i).amount); } assertEquals(data.get("id").toString(), actual.id); diff --git a/src/test/java/org/arkecosystem/crypto/transactions/deserializers/MultiSignatureRegistrationTest.java b/src/test/java/org/arkecosystem/crypto/transactions/deserializers/MultiSignatureRegistrationTest.java index 9e5474c5..2da0eb02 100644 --- a/src/test/java/org/arkecosystem/crypto/transactions/deserializers/MultiSignatureRegistrationTest.java +++ b/src/test/java/org/arkecosystem/crypto/transactions/deserializers/MultiSignatureRegistrationTest.java @@ -1,18 +1,19 @@ package org.arkecosystem.crypto.transactions.deserializers; +import static org.junit.jupiter.api.Assertions.assertEquals; + import com.google.gson.internal.LinkedTreeMap; import org.arkecosystem.crypto.transactions.Deserializer; import org.arkecosystem.crypto.transactions.FixtureLoader; import org.arkecosystem.crypto.transactions.Transaction; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; - class MultiSignatureRegistrationTest { @Test void passphrase() { - LinkedTreeMap fixture = FixtureLoader.load("transactions/V1/multi_signature_registration/passphrase"); + LinkedTreeMap fixture = + FixtureLoader.load("transactions/V1/multi_signature_registration/passphrase"); LinkedTreeMap data = (LinkedTreeMap) fixture.get("data"); Transaction actual = new Deserializer().deserialize(fixture.get("serialized").toString()); @@ -24,12 +25,14 @@ void passphrase() { assertEquals(data.get("signature").toString(), actual.signature); assertEquals(data.get("signatures"), actual.signatures); - LinkedTreeMap asset = (LinkedTreeMap) ((LinkedTreeMap) data.get("asset")).get("multisignature"); + LinkedTreeMap asset = + (LinkedTreeMap) + ((LinkedTreeMap) data.get("asset")).get("multisignature"); assertEquals(((Double) asset.get("min")).intValue(), actual.asset.multisignature.min); - assertEquals(((Double) asset.get("lifetime")).intValue(), actual.asset.multisignature.lifetime); + assertEquals( + ((Double) asset.get("lifetime")).intValue(), actual.asset.multisignature.lifetime); assertEquals((asset.get("keysgroup")), actual.asset.multisignature.keysgroup); assertEquals(data.get("id").toString(), actual.id); } - } diff --git a/src/test/java/org/arkecosystem/crypto/transactions/deserializers/SecondSignatureRegistrationTest.java b/src/test/java/org/arkecosystem/crypto/transactions/deserializers/SecondSignatureRegistrationTest.java index 3305358b..976f897c 100644 --- a/src/test/java/org/arkecosystem/crypto/transactions/deserializers/SecondSignatureRegistrationTest.java +++ b/src/test/java/org/arkecosystem/crypto/transactions/deserializers/SecondSignatureRegistrationTest.java @@ -1,5 +1,7 @@ package org.arkecosystem.crypto.transactions.deserializers; +import static org.junit.jupiter.api.Assertions.assertEquals; + import com.google.gson.internal.LinkedTreeMap; import org.arkecosystem.crypto.enums.TransactionTypeGroup; import org.arkecosystem.crypto.transactions.Deserializer; @@ -7,17 +9,19 @@ import org.arkecosystem.crypto.transactions.Transaction; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; - class SecondSignatureRegistrationTest { @Test void passphrase() { // V1 tests - LinkedTreeMap fixtureV1 = FixtureLoader.load("transactions/V1/second_signature_registration/second-passphrase"); - LinkedTreeMap dataV1 = (LinkedTreeMap) fixtureV1.get("data"); - - Transaction actualV1 = new Deserializer().deserialize(fixtureV1.get("serialized").toString()); + LinkedTreeMap fixtureV1 = + FixtureLoader.load( + "transactions/V1/second_signature_registration/second-passphrase"); + LinkedTreeMap dataV1 = + (LinkedTreeMap) fixtureV1.get("data"); + + Transaction actualV1 = + new Deserializer().deserialize(fixtureV1.get("serialized").toString()); assertEquals(((Double) dataV1.get("type")).intValue(), actualV1.type); assertEquals(((Double) dataV1.get("amount")).longValue(), actualV1.amount); assertEquals(((Double) dataV1.get("fee")).longValue(), actualV1.fee); @@ -25,17 +29,21 @@ void passphrase() { assertEquals(dataV1.get("senderPublicKey").toString(), actualV1.senderPublicKey); assertEquals(dataV1.get("signature").toString(), actualV1.signature); - LinkedTreeMap assetV1 = (LinkedTreeMap) ((LinkedTreeMap) dataV1.get("asset")).get("signature"); + LinkedTreeMap assetV1 = + (LinkedTreeMap) + ((LinkedTreeMap) dataV1.get("asset")).get("signature"); assertEquals((assetV1.get("publicKey")), actualV1.asset.signature.publicKey); assertEquals(dataV1.get("id").toString(), actualV1.id); - // V2 tests - LinkedTreeMap fixtureV2 = FixtureLoader.load("transactions/V2/second_signature_registration/passphrase"); - LinkedTreeMap dataV2 = (LinkedTreeMap) fixtureV2.get("data"); + LinkedTreeMap fixtureV2 = + FixtureLoader.load("transactions/V2/second_signature_registration/passphrase"); + LinkedTreeMap dataV2 = + (LinkedTreeMap) fixtureV2.get("data"); - Transaction actualV2 = new Deserializer().deserialize(fixtureV2.get("serialized").toString()); + Transaction actualV2 = + new Deserializer().deserialize(fixtureV2.get("serialized").toString()); assertEquals(((Double) dataV2.get("type")).intValue(), actualV2.type); assertEquals(TransactionTypeGroup.CORE.getValue(), actualV2.typeGroup); assertEquals((Long.valueOf((String) dataV2.get("fee"))), actualV2.fee); @@ -44,10 +52,11 @@ void passphrase() { assertEquals(dataV2.get("signature").toString(), actualV2.signature); assertEquals(dataV2.get("id").toString(), actualV2.id); - LinkedTreeMap assetV2 = (LinkedTreeMap) ((LinkedTreeMap) dataV2.get("asset")).get("signature"); + LinkedTreeMap assetV2 = + (LinkedTreeMap) + ((LinkedTreeMap) dataV2.get("asset")).get("signature"); assertEquals((assetV2.get("publicKey")), actualV2.asset.signature.publicKey); assertEquals(dataV2.get("id").toString(), actualV2.id); } - } diff --git a/src/test/java/org/arkecosystem/crypto/transactions/deserializers/TransferTest.java b/src/test/java/org/arkecosystem/crypto/transactions/deserializers/TransferTest.java index f2a2d702..311200ab 100644 --- a/src/test/java/org/arkecosystem/crypto/transactions/deserializers/TransferTest.java +++ b/src/test/java/org/arkecosystem/crypto/transactions/deserializers/TransferTest.java @@ -1,5 +1,7 @@ package org.arkecosystem.crypto.transactions.deserializers; +import static org.junit.jupiter.api.Assertions.assertEquals; + import com.google.gson.internal.LinkedTreeMap; import org.arkecosystem.crypto.enums.TransactionTypeGroup; import org.arkecosystem.crypto.transactions.Deserializer; @@ -7,17 +9,18 @@ import org.arkecosystem.crypto.transactions.Transaction; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; - class TransferTest { @Test void passphrase() { // V1 tests - LinkedTreeMap fixtureV1 = FixtureLoader.load("transactions/V1/transfer/passphrase"); - LinkedTreeMap dataV1 = (LinkedTreeMap) fixtureV1.get("data"); + LinkedTreeMap fixtureV1 = + FixtureLoader.load("transactions/V1/transfer/passphrase"); + LinkedTreeMap dataV1 = + (LinkedTreeMap) fixtureV1.get("data"); - Transaction actualV1 = new Deserializer().deserialize(fixtureV1.get("serialized").toString()); + Transaction actualV1 = + new Deserializer().deserialize(fixtureV1.get("serialized").toString()); assertEquals(((Double) dataV1.get("type")).intValue(), actualV1.type); assertEquals(((Double) dataV1.get("amount")).longValue(), actualV1.amount); assertEquals(((Double) dataV1.get("fee")).longValue(), actualV1.fee); @@ -27,12 +30,14 @@ void passphrase() { assertEquals(dataV1.get("signature").toString(), actualV1.signature); assertEquals(dataV1.get("id").toString(), actualV1.id); - // V2 tests - LinkedTreeMap fixtureV2 = FixtureLoader.load("transactions/V2/transfer/passphrase"); - LinkedTreeMap dataV2 = (LinkedTreeMap) fixtureV2.get("data"); + LinkedTreeMap fixtureV2 = + FixtureLoader.load("transactions/V2/transfer/passphrase"); + LinkedTreeMap dataV2 = + (LinkedTreeMap) fixtureV2.get("data"); - Transaction actualV2 = new Deserializer().deserialize(fixtureV2.get("serialized").toString()); + Transaction actualV2 = + new Deserializer().deserialize(fixtureV2.get("serialized").toString()); assertEquals(((Double) dataV2.get("type")).intValue(), actualV2.type); assertEquals(TransactionTypeGroup.CORE.getValue(), actualV2.typeGroup); assertEquals((Long.valueOf((String) dataV2.get("fee"))), actualV2.fee); @@ -43,16 +48,18 @@ void passphrase() { assertEquals(dataV2.get("id").toString(), actualV2.id); assertEquals((Long.valueOf((String) dataV2.get("amount"))), actualV2.amount); - } @Test void passphraseVendorField() { // V1 tests - LinkedTreeMap fixtureV1 = FixtureLoader.load("transactions/V1/transfer/passphrase-with-vendor-field"); - LinkedTreeMap dataV1 = (LinkedTreeMap) fixtureV1.get("data"); + LinkedTreeMap fixtureV1 = + FixtureLoader.load("transactions/V1/transfer/passphrase-with-vendor-field"); + LinkedTreeMap dataV1 = + (LinkedTreeMap) fixtureV1.get("data"); - Transaction actualV1 = new Deserializer().deserialize(fixtureV1.get("serialized").toString()); + Transaction actualV1 = + new Deserializer().deserialize(fixtureV1.get("serialized").toString()); assertEquals(((Double) dataV1.get("type")).intValue(), actualV1.type); assertEquals(((Double) dataV1.get("amount")).longValue(), actualV1.amount); assertEquals(((Double) dataV1.get("fee")).longValue(), actualV1.fee); @@ -63,12 +70,14 @@ void passphraseVendorField() { assertEquals(dataV1.get("signature").toString(), actualV1.signature); assertEquals(dataV1.get("id").toString(), actualV1.id); - // V2 tests - LinkedTreeMap fixtureV2 = FixtureLoader.load("transactions/V2/transfer/passphrase-with-vendor-field"); - LinkedTreeMap dataV2 = (LinkedTreeMap) fixtureV2.get("data"); + LinkedTreeMap fixtureV2 = + FixtureLoader.load("transactions/V2/transfer/passphrase-with-vendor-field"); + LinkedTreeMap dataV2 = + (LinkedTreeMap) fixtureV2.get("data"); - Transaction actualV2 = new Deserializer().deserialize(fixtureV2.get("serialized").toString()); + Transaction actualV2 = + new Deserializer().deserialize(fixtureV2.get("serialized").toString()); assertEquals(((Double) dataV2.get("type")).intValue(), actualV2.type); assertEquals(TransactionTypeGroup.CORE.getValue(), actualV2.typeGroup); assertEquals((Long.valueOf((String) dataV2.get("fee"))), actualV2.fee); @@ -85,10 +94,13 @@ void passphraseVendorField() { @Test void passphraseVendorFieldHex() { // V1 tests - LinkedTreeMap fixtureV1 = FixtureLoader.load("transactions/V1/transfer/passphrase-with-vendor-field-hex"); - LinkedTreeMap dataV1 = (LinkedTreeMap) fixtureV1.get("data"); + LinkedTreeMap fixtureV1 = + FixtureLoader.load("transactions/V1/transfer/passphrase-with-vendor-field-hex"); + LinkedTreeMap dataV1 = + (LinkedTreeMap) fixtureV1.get("data"); - Transaction actualV1 = new Deserializer().deserialize(fixtureV1.get("serialized").toString()); + Transaction actualV1 = + new Deserializer().deserialize(fixtureV1.get("serialized").toString()); assertEquals(((Double) dataV1.get("type")).intValue(), actualV1.type); assertEquals(((Double) dataV1.get("amount")).longValue(), actualV1.amount); assertEquals(((Double) dataV1.get("fee")).longValue(), actualV1.fee); @@ -99,12 +111,14 @@ void passphraseVendorFieldHex() { assertEquals(dataV1.get("signature").toString(), actualV1.signature); assertEquals(dataV1.get("id").toString(), actualV1.id); - // V2 tests - LinkedTreeMap fixtureV2 = FixtureLoader.load("transactions/V2/transfer/passphrase-with-vendor-field-hex"); - LinkedTreeMap dataV2 = (LinkedTreeMap) fixtureV2.get("data"); + LinkedTreeMap fixtureV2 = + FixtureLoader.load("transactions/V2/transfer/passphrase-with-vendor-field-hex"); + LinkedTreeMap dataV2 = + (LinkedTreeMap) fixtureV2.get("data"); - Transaction actualV2 = new Deserializer().deserialize(fixtureV2.get("serialized").toString()); + Transaction actualV2 = + new Deserializer().deserialize(fixtureV2.get("serialized").toString()); assertEquals(((Double) dataV2.get("type")).intValue(), actualV2.type); assertEquals(TransactionTypeGroup.CORE.getValue(), actualV2.typeGroup); assertEquals((Long.valueOf((String) dataV2.get("fee"))), actualV2.fee); @@ -116,16 +130,18 @@ void passphraseVendorFieldHex() { assertEquals((Long.valueOf((String) dataV2.get("amount"))), actualV2.amount); assertEquals(dataV2.get("vendorFieldHex").toString(), actualV2.vendorFieldHex); - } @Test void secondPassphrase() { // V1 tests - LinkedTreeMap fixtureV1 = FixtureLoader.load("transactions/V1/transfer/second-passphrase"); - LinkedTreeMap dataV1 = (LinkedTreeMap) fixtureV1.get("data"); + LinkedTreeMap fixtureV1 = + FixtureLoader.load("transactions/V1/transfer/second-passphrase"); + LinkedTreeMap dataV1 = + (LinkedTreeMap) fixtureV1.get("data"); - Transaction actualV1 = new Deserializer().deserialize(fixtureV1.get("serialized").toString()); + Transaction actualV1 = + new Deserializer().deserialize(fixtureV1.get("serialized").toString()); assertEquals(((Double) dataV1.get("type")).intValue(), actualV1.type); assertEquals(((Double) dataV1.get("amount")).longValue(), actualV1.amount); assertEquals(((Double) dataV1.get("fee")).longValue(), actualV1.fee); @@ -136,12 +152,14 @@ void secondPassphrase() { assertEquals(dataV1.get("signSignature").toString(), actualV1.signSignature); assertEquals(dataV1.get("id").toString(), actualV1.id); - // V2 tests - LinkedTreeMap fixtureV2 = FixtureLoader.load("transactions/V2/transfer/second-passphrase"); - LinkedTreeMap dataV2 = (LinkedTreeMap) fixtureV2.get("data"); + LinkedTreeMap fixtureV2 = + FixtureLoader.load("transactions/V2/transfer/second-passphrase"); + LinkedTreeMap dataV2 = + (LinkedTreeMap) fixtureV2.get("data"); - Transaction actualV2 = new Deserializer().deserialize(fixtureV2.get("serialized").toString()); + Transaction actualV2 = + new Deserializer().deserialize(fixtureV2.get("serialized").toString()); assertEquals(((Double) dataV2.get("type")).intValue(), actualV2.type); assertEquals(TransactionTypeGroup.CORE.getValue(), actualV2.typeGroup); assertEquals((Long.valueOf((String) dataV2.get("fee"))), actualV2.fee); @@ -159,10 +177,13 @@ void secondPassphrase() { @Test void secondPassphraseVendorField() { // V1 tests - LinkedTreeMap fixtureV1 = FixtureLoader.load("transactions/V1/transfer/second-passphrase-with-vendor-field"); - LinkedTreeMap dataV1 = (LinkedTreeMap) fixtureV1.get("data"); + LinkedTreeMap fixtureV1 = + FixtureLoader.load("transactions/V1/transfer/second-passphrase-with-vendor-field"); + LinkedTreeMap dataV1 = + (LinkedTreeMap) fixtureV1.get("data"); - Transaction actualV1 = new Deserializer().deserialize(fixtureV1.get("serialized").toString()); + Transaction actualV1 = + new Deserializer().deserialize(fixtureV1.get("serialized").toString()); assertEquals(((Double) dataV1.get("type")).intValue(), actualV1.type); assertEquals(((Double) dataV1.get("amount")).longValue(), actualV1.amount); assertEquals(((Double) dataV1.get("fee")).longValue(), actualV1.fee); @@ -174,12 +195,14 @@ void secondPassphraseVendorField() { assertEquals(dataV1.get("signSignature").toString(), actualV1.signSignature); assertEquals(dataV1.get("id").toString(), actualV1.id); - // V2 tests - LinkedTreeMap fixtureV2 = FixtureLoader.load("transactions/V2/transfer/second-passphrase-with-vendor-field"); - LinkedTreeMap dataV2 = (LinkedTreeMap) fixtureV2.get("data"); + LinkedTreeMap fixtureV2 = + FixtureLoader.load("transactions/V2/transfer/second-passphrase-with-vendor-field"); + LinkedTreeMap dataV2 = + (LinkedTreeMap) fixtureV2.get("data"); - Transaction actualV2 = new Deserializer().deserialize(fixtureV2.get("serialized").toString()); + Transaction actualV2 = + new Deserializer().deserialize(fixtureV2.get("serialized").toString()); assertEquals(((Double) dataV2.get("type")).intValue(), actualV2.type); assertEquals(TransactionTypeGroup.CORE.getValue(), actualV2.typeGroup); assertEquals((Long.valueOf((String) dataV2.get("fee"))), actualV2.fee); @@ -198,10 +221,14 @@ void secondPassphraseVendorField() { @Test void secondPassphraseVendorFieldHex() { // V1 tests - LinkedTreeMap fixtureV1 = FixtureLoader.load("transactions/V1/transfer/second-passphrase-with-vendor-field-hex"); - LinkedTreeMap dataV1 = (LinkedTreeMap) fixtureV1.get("data"); - - Transaction actualV1 = new Deserializer().deserialize(fixtureV1.get("serialized").toString()); + LinkedTreeMap fixtureV1 = + FixtureLoader.load( + "transactions/V1/transfer/second-passphrase-with-vendor-field-hex"); + LinkedTreeMap dataV1 = + (LinkedTreeMap) fixtureV1.get("data"); + + Transaction actualV1 = + new Deserializer().deserialize(fixtureV1.get("serialized").toString()); assertEquals(((Double) dataV1.get("type")).intValue(), actualV1.type); assertEquals(((Double) dataV1.get("amount")).longValue(), actualV1.amount); assertEquals(((Double) dataV1.get("fee")).longValue(), actualV1.fee); @@ -213,12 +240,15 @@ void secondPassphraseVendorFieldHex() { assertEquals(dataV1.get("signSignature").toString(), actualV1.signSignature); assertEquals(dataV1.get("id").toString(), actualV1.id); - // V2 tests - LinkedTreeMap fixtureV2 = FixtureLoader.load("transactions/V2/transfer/second-passphrase-with-vendor-field-hex"); - LinkedTreeMap dataV2 = (LinkedTreeMap) fixtureV2.get("data"); - - Transaction actualV2 = new Deserializer().deserialize(fixtureV2.get("serialized").toString()); + LinkedTreeMap fixtureV2 = + FixtureLoader.load( + "transactions/V2/transfer/second-passphrase-with-vendor-field-hex"); + LinkedTreeMap dataV2 = + (LinkedTreeMap) fixtureV2.get("data"); + + Transaction actualV2 = + new Deserializer().deserialize(fixtureV2.get("serialized").toString()); assertEquals(((Double) dataV2.get("type")).intValue(), actualV2.type); assertEquals(TransactionTypeGroup.CORE.getValue(), actualV2.typeGroup); assertEquals((Long.valueOf((String) dataV2.get("fee"))), actualV2.fee); @@ -233,5 +263,4 @@ void secondPassphraseVendorFieldHex() { assertEquals(dataV2.get("secondSignature").toString(), actualV2.secondSignature); assertEquals(dataV2.get("vendorFieldHex").toString(), actualV2.vendorFieldHex); } - } diff --git a/src/test/java/org/arkecosystem/crypto/transactions/deserializers/VoteTest.java b/src/test/java/org/arkecosystem/crypto/transactions/deserializers/VoteTest.java index 2f3eb731..b3099180 100644 --- a/src/test/java/org/arkecosystem/crypto/transactions/deserializers/VoteTest.java +++ b/src/test/java/org/arkecosystem/crypto/transactions/deserializers/VoteTest.java @@ -1,5 +1,7 @@ package org.arkecosystem.crypto.transactions.deserializers; +import static org.junit.jupiter.api.Assertions.assertEquals; + import com.google.gson.internal.LinkedTreeMap; import org.arkecosystem.crypto.enums.TransactionTypeGroup; import org.arkecosystem.crypto.transactions.Deserializer; @@ -7,17 +9,18 @@ import org.arkecosystem.crypto.transactions.Transaction; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; - class VoteTest { @Test void passphrase() { // V1 tests - LinkedTreeMap fixtureV1 = FixtureLoader.load("transactions/V1/vote/passphrase"); - LinkedTreeMap dataV1 = (LinkedTreeMap) fixtureV1.get("data"); + LinkedTreeMap fixtureV1 = + FixtureLoader.load("transactions/V1/vote/passphrase"); + LinkedTreeMap dataV1 = + (LinkedTreeMap) fixtureV1.get("data"); - Transaction actualV1 = new Deserializer().deserialize(fixtureV1.get("serialized").toString()); + Transaction actualV1 = + new Deserializer().deserialize(fixtureV1.get("serialized").toString()); assertEquals(((Double) dataV1.get("type")).intValue(), actualV1.type); assertEquals(((Double) dataV1.get("amount")).longValue(), actualV1.amount); assertEquals(((Double) dataV1.get("fee")).longValue(), actualV1.fee); @@ -31,12 +34,14 @@ void passphrase() { assertEquals(dataV1.get("id").toString(), actualV1.id); - // V2 tests - LinkedTreeMap fixtureV2 = FixtureLoader.load("transactions/V2/vote/passphrase"); - LinkedTreeMap dataV2 = (LinkedTreeMap) fixtureV2.get("data"); + LinkedTreeMap fixtureV2 = + FixtureLoader.load("transactions/V2/vote/passphrase"); + LinkedTreeMap dataV2 = + (LinkedTreeMap) fixtureV2.get("data"); - Transaction actualV2 = new Deserializer().deserialize(fixtureV2.get("serialized").toString()); + Transaction actualV2 = + new Deserializer().deserialize(fixtureV2.get("serialized").toString()); assertEquals(((Double) dataV2.get("type")).intValue(), actualV2.type); assertEquals(TransactionTypeGroup.CORE.getValue(), actualV2.typeGroup); assertEquals((Long.valueOf((String) dataV2.get("fee"))), actualV2.fee); @@ -54,10 +59,13 @@ void passphrase() { @Test void secondPassphrase() { // V1 tests - LinkedTreeMap fixtureV1 = FixtureLoader.load("transactions/V1/vote/second-passphrase"); - LinkedTreeMap dataV1 = (LinkedTreeMap) fixtureV1.get("data"); + LinkedTreeMap fixtureV1 = + FixtureLoader.load("transactions/V1/vote/second-passphrase"); + LinkedTreeMap dataV1 = + (LinkedTreeMap) fixtureV1.get("data"); - Transaction actualV1 = new Deserializer().deserialize(fixtureV1.get("serialized").toString()); + Transaction actualV1 = + new Deserializer().deserialize(fixtureV1.get("serialized").toString()); assertEquals(((Double) dataV1.get("type")).intValue(), actualV1.type); assertEquals(((Double) dataV1.get("amount")).longValue(), actualV1.amount); assertEquals(((Double) dataV1.get("fee")).longValue(), actualV1.fee); @@ -72,12 +80,14 @@ void secondPassphrase() { assertEquals(dataV1.get("id").toString(), actualV1.id); - // V2 tests - LinkedTreeMap fixtureV2 = FixtureLoader.load("transactions/V2/vote/second-passphrase"); - LinkedTreeMap dataV2 = (LinkedTreeMap) fixtureV2.get("data"); + LinkedTreeMap fixtureV2 = + FixtureLoader.load("transactions/V2/vote/second-passphrase"); + LinkedTreeMap dataV2 = + (LinkedTreeMap) fixtureV2.get("data"); - Transaction actualV2 = new Deserializer().deserialize(fixtureV2.get("serialized").toString()); + Transaction actualV2 = + new Deserializer().deserialize(fixtureV2.get("serialized").toString()); assertEquals(((Double) dataV2.get("type")).intValue(), actualV2.type); assertEquals(TransactionTypeGroup.CORE.getValue(), actualV2.typeGroup); assertEquals((Long.valueOf((String) dataV2.get("fee"))), actualV2.fee); @@ -94,5 +104,4 @@ void secondPassphrase() { assertEquals(dataV2.get("id").toString(), actualV2.id); } - } diff --git a/src/test/java/org/arkecosystem/crypto/transactions/serializers/DelegateRegistrationTest.java b/src/test/java/org/arkecosystem/crypto/transactions/serializers/DelegateRegistrationTest.java index 5613ba52..957674ef 100644 --- a/src/test/java/org/arkecosystem/crypto/transactions/serializers/DelegateRegistrationTest.java +++ b/src/test/java/org/arkecosystem/crypto/transactions/serializers/DelegateRegistrationTest.java @@ -1,5 +1,7 @@ package org.arkecosystem.crypto.transactions.serializers; +import static org.junit.jupiter.api.Assertions.assertEquals; + import com.google.gson.internal.LinkedTreeMap; import org.arkecosystem.crypto.encoding.Hex; import org.arkecosystem.crypto.transactions.Deserializer; @@ -8,25 +10,26 @@ import org.arkecosystem.crypto.transactions.Transaction; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; - class DelegateRegistrationTest { @Test void passphrase() { // V1 tests - LinkedTreeMap fixtureV1 = FixtureLoader.load("transactions/V1/delegate_registration/passphrase"); + LinkedTreeMap fixtureV1 = + FixtureLoader.load("transactions/V1/delegate_registration/passphrase"); - Transaction transactionV1 = new Deserializer().deserialize(fixtureV1.get("serialized").toString()); + Transaction transactionV1 = + new Deserializer().deserialize(fixtureV1.get("serialized").toString()); String actualV1 = Hex.encode(new Serializer().serialize(transactionV1)); assertEquals(fixtureV1.get("serialized").toString(), actualV1); - // V2 tests - LinkedTreeMap fixtureV2 = FixtureLoader.load("transactions/V2/delegate_registration/passphrase"); + LinkedTreeMap fixtureV2 = + FixtureLoader.load("transactions/V2/delegate_registration/passphrase"); - Transaction transactionV2 = new Deserializer().deserialize(fixtureV2.get("serialized").toString()); + Transaction transactionV2 = + new Deserializer().deserialize(fixtureV2.get("serialized").toString()); String actualV2 = Hex.encode(new Serializer().serialize(transactionV2)); assertEquals(fixtureV2.get("serialized").toString(), actualV2); @@ -35,21 +38,23 @@ void passphrase() { @Test void secondPassphrase() { // V1 tests - LinkedTreeMap fixtureV1 = FixtureLoader.load("transactions/V1/delegate_registration/second-passphrase"); + LinkedTreeMap fixtureV1 = + FixtureLoader.load("transactions/V1/delegate_registration/second-passphrase"); - Transaction transactionV1 = new Deserializer().deserialize(fixtureV1.get("serialized").toString()); + Transaction transactionV1 = + new Deserializer().deserialize(fixtureV1.get("serialized").toString()); String actualV1 = Hex.encode(new Serializer().serialize(transactionV1)); assertEquals(fixtureV1.get("serialized").toString(), actualV1); - // V2 tests - LinkedTreeMap fixtureV2 = FixtureLoader.load("transactions/V2/delegate_registration/second-passphrase"); + LinkedTreeMap fixtureV2 = + FixtureLoader.load("transactions/V2/delegate_registration/second-passphrase"); - Transaction transactionV2 = new Deserializer().deserialize(fixtureV2.get("serialized").toString()); + Transaction transactionV2 = + new Deserializer().deserialize(fixtureV2.get("serialized").toString()); String actualV2 = Hex.encode(new Serializer().serialize(transactionV2)); assertEquals(fixtureV2.get("serialized").toString(), actualV2); } - } diff --git a/src/test/java/org/arkecosystem/crypto/transactions/serializers/DelegateResignationTest.java b/src/test/java/org/arkecosystem/crypto/transactions/serializers/DelegateResignationTest.java index 0e3ad06c..ff3951ef 100644 --- a/src/test/java/org/arkecosystem/crypto/transactions/serializers/DelegateResignationTest.java +++ b/src/test/java/org/arkecosystem/crypto/transactions/serializers/DelegateResignationTest.java @@ -1,5 +1,7 @@ package org.arkecosystem.crypto.transactions.serializers; +import static org.junit.jupiter.api.Assertions.assertEquals; + import com.google.gson.internal.LinkedTreeMap; import org.arkecosystem.crypto.encoding.Hex; import org.arkecosystem.crypto.transactions.Deserializer; @@ -8,15 +10,15 @@ import org.arkecosystem.crypto.transactions.Transaction; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; - public class DelegateResignationTest { @Test void passphrase() { - LinkedTreeMap fixture = FixtureLoader.load("transactions/V2/delegate_resignation/passphrase"); + LinkedTreeMap fixture = + FixtureLoader.load("transactions/V2/delegate_resignation/passphrase"); - Transaction transaction = new Deserializer().deserialize(fixture.get("serialized").toString()); + Transaction transaction = + new Deserializer().deserialize(fixture.get("serialized").toString()); String actual = Hex.encode(new Serializer().serialize(transaction)); assertEquals(fixture.get("serialized").toString(), actual); @@ -24,9 +26,11 @@ void passphrase() { @Test void secondPassphrase() { - LinkedTreeMap fixture = FixtureLoader.load("transactions/V2/delegate_resignation/second-passphrase"); + LinkedTreeMap fixture = + FixtureLoader.load("transactions/V2/delegate_resignation/second-passphrase"); - Transaction transaction = new Deserializer().deserialize(fixture.get("serialized").toString()); + Transaction transaction = + new Deserializer().deserialize(fixture.get("serialized").toString()); String actual = Hex.encode(new Serializer().serialize(transaction)); assertEquals(fixture.get("serialized").toString(), actual); diff --git a/src/test/java/org/arkecosystem/crypto/transactions/serializers/HtlcClaimTest.java b/src/test/java/org/arkecosystem/crypto/transactions/serializers/HtlcClaimTest.java index c0c9c84a..0d5b97ff 100644 --- a/src/test/java/org/arkecosystem/crypto/transactions/serializers/HtlcClaimTest.java +++ b/src/test/java/org/arkecosystem/crypto/transactions/serializers/HtlcClaimTest.java @@ -1,5 +1,7 @@ package org.arkecosystem.crypto.transactions.serializers; +import static org.junit.jupiter.api.Assertions.assertEquals; + import com.google.gson.internal.LinkedTreeMap; import org.arkecosystem.crypto.encoding.Hex; import org.arkecosystem.crypto.transactions.Deserializer; @@ -8,27 +10,28 @@ import org.arkecosystem.crypto.transactions.Transaction; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; - public class HtlcClaimTest { @Test void passphrase() { - LinkedTreeMap fixture = FixtureLoader.load("transactions/V2/htlc-claim/passphrase"); + LinkedTreeMap fixture = + FixtureLoader.load("transactions/V2/htlc-claim/passphrase"); - Transaction transaction = new Deserializer().deserialize(fixture.get("serialized").toString()); + Transaction transaction = + new Deserializer().deserialize(fixture.get("serialized").toString()); String actual = Hex.encode(new Serializer().serialize(transaction)); assertEquals(fixture.get("serialized").toString(), actual); } @Test void secondPassphrase() { - LinkedTreeMap fixture = FixtureLoader.load("transactions/V2/htlc-claim/second-passphrase"); + LinkedTreeMap fixture = + FixtureLoader.load("transactions/V2/htlc-claim/second-passphrase"); - Transaction transaction = new Deserializer().deserialize(fixture.get("serialized").toString()); + Transaction transaction = + new Deserializer().deserialize(fixture.get("serialized").toString()); String actual = Hex.encode(new Serializer().serialize(transaction)); assertEquals(fixture.get("serialized").toString(), actual); } - } diff --git a/src/test/java/org/arkecosystem/crypto/transactions/serializers/HtlcLockTest.java b/src/test/java/org/arkecosystem/crypto/transactions/serializers/HtlcLockTest.java index 99a5f3e3..e109940d 100644 --- a/src/test/java/org/arkecosystem/crypto/transactions/serializers/HtlcLockTest.java +++ b/src/test/java/org/arkecosystem/crypto/transactions/serializers/HtlcLockTest.java @@ -1,5 +1,7 @@ package org.arkecosystem.crypto.transactions.serializers; +import static org.junit.jupiter.api.Assertions.assertEquals; + import com.google.gson.internal.LinkedTreeMap; import org.arkecosystem.crypto.encoding.Hex; import org.arkecosystem.crypto.transactions.Deserializer; @@ -8,27 +10,28 @@ import org.arkecosystem.crypto.transactions.Transaction; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; - public class HtlcLockTest { @Test void passphrase() { - LinkedTreeMap fixture = FixtureLoader.load("transactions/V2/htlc-lock/passphrase"); + LinkedTreeMap fixture = + FixtureLoader.load("transactions/V2/htlc-lock/passphrase"); - Transaction transaction = new Deserializer().deserialize(fixture.get("serialized").toString()); + Transaction transaction = + new Deserializer().deserialize(fixture.get("serialized").toString()); String actual = Hex.encode(new Serializer().serialize(transaction)); assertEquals(fixture.get("serialized").toString(), actual); } @Test void secondPassphrase() { - LinkedTreeMap fixture = FixtureLoader.load("transactions/V2/htlc-lock/second-passphrase"); + LinkedTreeMap fixture = + FixtureLoader.load("transactions/V2/htlc-lock/second-passphrase"); - Transaction transaction = new Deserializer().deserialize(fixture.get("serialized").toString()); + Transaction transaction = + new Deserializer().deserialize(fixture.get("serialized").toString()); String actual = Hex.encode(new Serializer().serialize(transaction)); assertEquals(fixture.get("serialized").toString(), actual); } - } diff --git a/src/test/java/org/arkecosystem/crypto/transactions/serializers/HtlcRefundTest.java b/src/test/java/org/arkecosystem/crypto/transactions/serializers/HtlcRefundTest.java index ae66d9f9..6a6c1913 100644 --- a/src/test/java/org/arkecosystem/crypto/transactions/serializers/HtlcRefundTest.java +++ b/src/test/java/org/arkecosystem/crypto/transactions/serializers/HtlcRefundTest.java @@ -1,5 +1,7 @@ package org.arkecosystem.crypto.transactions.serializers; +import static org.junit.jupiter.api.Assertions.assertEquals; + import com.google.gson.internal.LinkedTreeMap; import org.arkecosystem.crypto.encoding.Hex; import org.arkecosystem.crypto.transactions.Deserializer; @@ -8,23 +10,25 @@ import org.arkecosystem.crypto.transactions.Transaction; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; - public class HtlcRefundTest { @Test void passphrase() { - LinkedTreeMap fixture = FixtureLoader.load("transactions/V2/htlc-refund/passphrase"); + LinkedTreeMap fixture = + FixtureLoader.load("transactions/V2/htlc-refund/passphrase"); - Transaction transaction = new Deserializer().deserialize(fixture.get("serialized").toString()); + Transaction transaction = + new Deserializer().deserialize(fixture.get("serialized").toString()); String actual = Hex.encode(new Serializer().serialize(transaction)); assertEquals(fixture.get("serialized").toString(), actual); } @Test void secondPassphrase() { - LinkedTreeMap fixture = FixtureLoader.load("transactions/V2/htlc-refund/second-passphrase"); + LinkedTreeMap fixture = + FixtureLoader.load("transactions/V2/htlc-refund/second-passphrase"); - Transaction transaction = new Deserializer().deserialize(fixture.get("serialized").toString()); + Transaction transaction = + new Deserializer().deserialize(fixture.get("serialized").toString()); String actual = Hex.encode(new Serializer().serialize(transaction)); assertEquals(fixture.get("serialized").toString(), actual); diff --git a/src/test/java/org/arkecosystem/crypto/transactions/serializers/IpfsTest.java b/src/test/java/org/arkecosystem/crypto/transactions/serializers/IpfsTest.java index 145fc441..24030c71 100644 --- a/src/test/java/org/arkecosystem/crypto/transactions/serializers/IpfsTest.java +++ b/src/test/java/org/arkecosystem/crypto/transactions/serializers/IpfsTest.java @@ -1,5 +1,7 @@ package org.arkecosystem.crypto.transactions.serializers; +import static org.junit.jupiter.api.Assertions.assertEquals; + import com.google.gson.internal.LinkedTreeMap; import org.arkecosystem.crypto.encoding.Hex; import org.arkecosystem.crypto.transactions.Deserializer; @@ -8,15 +10,15 @@ import org.arkecosystem.crypto.transactions.Transaction; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; - public class IpfsTest { @Test void passphrase() { - LinkedTreeMap fixture = FixtureLoader.load("transactions/V2/ipfs/passphrase"); + LinkedTreeMap fixture = + FixtureLoader.load("transactions/V2/ipfs/passphrase"); - Transaction transaction = new Deserializer().deserialize(fixture.get("serialized").toString()); + Transaction transaction = + new Deserializer().deserialize(fixture.get("serialized").toString()); String actual = Hex.encode(new Serializer().serialize(transaction)); assertEquals(fixture.get("serialized").toString(), actual); @@ -24,9 +26,11 @@ void passphrase() { @Test void secondPassphrase() { - LinkedTreeMap fixture = FixtureLoader.load("transactions/V2/ipfs/second-passphrase"); + LinkedTreeMap fixture = + FixtureLoader.load("transactions/V2/ipfs/second-passphrase"); - Transaction transaction = new Deserializer().deserialize(fixture.get("serialized").toString()); + Transaction transaction = + new Deserializer().deserialize(fixture.get("serialized").toString()); String actual = Hex.encode(new Serializer().serialize(transaction)); assertEquals(fixture.get("serialized").toString(), actual); diff --git a/src/test/java/org/arkecosystem/crypto/transactions/serializers/MultiPaymentTest.java b/src/test/java/org/arkecosystem/crypto/transactions/serializers/MultiPaymentTest.java index 35e77e08..a3271f1e 100644 --- a/src/test/java/org/arkecosystem/crypto/transactions/serializers/MultiPaymentTest.java +++ b/src/test/java/org/arkecosystem/crypto/transactions/serializers/MultiPaymentTest.java @@ -1,5 +1,7 @@ package org.arkecosystem.crypto.transactions.serializers; +import static org.junit.jupiter.api.Assertions.assertEquals; + import com.google.gson.internal.LinkedTreeMap; import org.arkecosystem.crypto.encoding.Hex; import org.arkecosystem.crypto.transactions.Deserializer; @@ -8,15 +10,15 @@ import org.arkecosystem.crypto.transactions.Transaction; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; - public class MultiPaymentTest { @Test void passphrase() { - LinkedTreeMap fixture = FixtureLoader.load("transactions/V2/multi_payment/passphrase"); + LinkedTreeMap fixture = + FixtureLoader.load("transactions/V2/multi_payment/passphrase"); - Transaction transaction = new Deserializer().deserialize(fixture.get("serialized").toString()); + Transaction transaction = + new Deserializer().deserialize(fixture.get("serialized").toString()); String actual = Hex.encode(new Serializer().serialize(transaction)); assertEquals(fixture.get("serialized").toString(), actual); @@ -24,9 +26,11 @@ void passphrase() { @Test void secondPassphrase() { - LinkedTreeMap fixture = FixtureLoader.load("transactions/V2/multi_payment/second-passphrase"); + LinkedTreeMap fixture = + FixtureLoader.load("transactions/V2/multi_payment/second-passphrase"); - Transaction transaction = new Deserializer().deserialize(fixture.get("serialized").toString()); + Transaction transaction = + new Deserializer().deserialize(fixture.get("serialized").toString()); String actual = Hex.encode(new Serializer().serialize(transaction)); assertEquals(fixture.get("serialized").toString(), actual); diff --git a/src/test/java/org/arkecosystem/crypto/transactions/serializers/MultiSignatureRegistrationTest.java b/src/test/java/org/arkecosystem/crypto/transactions/serializers/MultiSignatureRegistrationTest.java index 087a0696..a08edc4a 100644 --- a/src/test/java/org/arkecosystem/crypto/transactions/serializers/MultiSignatureRegistrationTest.java +++ b/src/test/java/org/arkecosystem/crypto/transactions/serializers/MultiSignatureRegistrationTest.java @@ -1,5 +1,7 @@ package org.arkecosystem.crypto.transactions.serializers; +import static org.junit.jupiter.api.Assertions.assertEquals; + import com.google.gson.internal.LinkedTreeMap; import org.arkecosystem.crypto.encoding.Hex; import org.arkecosystem.crypto.transactions.Deserializer; @@ -8,18 +10,17 @@ import org.arkecosystem.crypto.transactions.Transaction; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; - class MultiSignatureRegistrationTest { @Test void passphrase() { - LinkedTreeMap fixture = FixtureLoader.load("transactions/V1/multi_signature_registration/passphrase"); + LinkedTreeMap fixture = + FixtureLoader.load("transactions/V1/multi_signature_registration/passphrase"); - Transaction transaction = new Deserializer().deserialize(fixture.get("serialized").toString()); + Transaction transaction = + new Deserializer().deserialize(fixture.get("serialized").toString()); String actual = Hex.encode(new Serializer().serialize(transaction)); assertEquals(fixture.get("serialized").toString(), actual); } - } diff --git a/src/test/java/org/arkecosystem/crypto/transactions/serializers/SecondSignatureRegistrationTest.java b/src/test/java/org/arkecosystem/crypto/transactions/serializers/SecondSignatureRegistrationTest.java index c541daf2..20367cb6 100644 --- a/src/test/java/org/arkecosystem/crypto/transactions/serializers/SecondSignatureRegistrationTest.java +++ b/src/test/java/org/arkecosystem/crypto/transactions/serializers/SecondSignatureRegistrationTest.java @@ -1,5 +1,7 @@ package org.arkecosystem.crypto.transactions.serializers; +import static org.junit.jupiter.api.Assertions.assertEquals; + import com.google.gson.internal.LinkedTreeMap; import org.arkecosystem.crypto.encoding.Hex; import org.arkecosystem.crypto.transactions.Deserializer; @@ -8,28 +10,29 @@ import org.arkecosystem.crypto.transactions.Transaction; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; - class SecondSignatureRegistrationTest { @Test void passphrase() { // V1 tests - LinkedTreeMap fixtureV1 = FixtureLoader.load("transactions/V1/second_signature_registration/second-passphrase"); + LinkedTreeMap fixtureV1 = + FixtureLoader.load( + "transactions/V1/second_signature_registration/second-passphrase"); - Transaction transactionV1 = new Deserializer().deserialize(fixtureV1.get("serialized").toString()); + Transaction transactionV1 = + new Deserializer().deserialize(fixtureV1.get("serialized").toString()); String actualV1 = Hex.encode(new Serializer().serialize(transactionV1)); assertEquals(fixtureV1.get("serialized").toString(), actualV1); - // V2 tests - LinkedTreeMap fixtureV2 = FixtureLoader.load("transactions/V2/second_signature_registration/passphrase"); + LinkedTreeMap fixtureV2 = + FixtureLoader.load("transactions/V2/second_signature_registration/passphrase"); - Transaction transactionV2 = new Deserializer().deserialize(fixtureV2.get("serialized").toString()); + Transaction transactionV2 = + new Deserializer().deserialize(fixtureV2.get("serialized").toString()); String actualV2 = Hex.encode(new Serializer().serialize(transactionV2)); assertEquals(fixtureV2.get("serialized").toString(), actualV2); } - } diff --git a/src/test/java/org/arkecosystem/crypto/transactions/serializers/TransferTest.java b/src/test/java/org/arkecosystem/crypto/transactions/serializers/TransferTest.java index 2cb1cd48..48afc660 100644 --- a/src/test/java/org/arkecosystem/crypto/transactions/serializers/TransferTest.java +++ b/src/test/java/org/arkecosystem/crypto/transactions/serializers/TransferTest.java @@ -1,5 +1,7 @@ package org.arkecosystem.crypto.transactions.serializers; +import static org.junit.jupiter.api.Assertions.assertEquals; + import com.google.gson.internal.LinkedTreeMap; import org.arkecosystem.crypto.encoding.Hex; import org.arkecosystem.crypto.transactions.Deserializer; @@ -8,25 +10,26 @@ import org.arkecosystem.crypto.transactions.Transaction; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; - public class TransferTest { @Test void passphrase() { // V1 tests - LinkedTreeMap fixture = FixtureLoader.load("transactions/V1/transfer/passphrase"); + LinkedTreeMap fixture = + FixtureLoader.load("transactions/V1/transfer/passphrase"); - Transaction transaction = new Deserializer().deserialize(fixture.get("serialized").toString()); + Transaction transaction = + new Deserializer().deserialize(fixture.get("serialized").toString()); String actual = Hex.encode(new Serializer().serialize(transaction)); assertEquals(fixture.get("serialized").toString(), actual); - // V2 tests - LinkedTreeMap fixtureV2 = FixtureLoader.load("transactions/V2/transfer/passphrase"); + LinkedTreeMap fixtureV2 = + FixtureLoader.load("transactions/V2/transfer/passphrase"); - Transaction transaction2 = new Deserializer().deserialize(fixtureV2.get("serialized").toString()); + Transaction transaction2 = + new Deserializer().deserialize(fixtureV2.get("serialized").toString()); String actual2 = Hex.encode(new Serializer().serialize(transaction2)); assertEquals(fixtureV2.get("serialized").toString(), actual2); @@ -35,18 +38,21 @@ void passphrase() { @Test void passphraseVendorField() { // V1 tests - LinkedTreeMap fixtureV1 = FixtureLoader.load("transactions/V1/transfer/passphrase-with-vendor-field"); + LinkedTreeMap fixtureV1 = + FixtureLoader.load("transactions/V1/transfer/passphrase-with-vendor-field"); - Transaction transactionV1 = new Deserializer().deserialize(fixtureV1.get("serialized").toString()); + Transaction transactionV1 = + new Deserializer().deserialize(fixtureV1.get("serialized").toString()); String actualV1 = Hex.encode(new Serializer().serialize(transactionV1)); assertEquals(fixtureV1.get("serialized").toString(), actualV1); - // V2 tests - LinkedTreeMap fixtureV2 = FixtureLoader.load("transactions/V2/transfer/passphrase-with-vendor-field"); + LinkedTreeMap fixtureV2 = + FixtureLoader.load("transactions/V2/transfer/passphrase-with-vendor-field"); - Transaction transactionV2 = new Deserializer().deserialize(fixtureV2.get("serialized").toString()); + Transaction transactionV2 = + new Deserializer().deserialize(fixtureV2.get("serialized").toString()); String actualV2 = Hex.encode(new Serializer().serialize(transactionV2)); assertEquals(fixtureV2.get("serialized").toString(), actualV2); @@ -55,18 +61,21 @@ void passphraseVendorField() { @Test void passphraseVendorFieldHex() { // V1 tests - LinkedTreeMap fixtureV1 = FixtureLoader.load("transactions/V1/transfer/passphrase-with-vendor-field-hex"); + LinkedTreeMap fixtureV1 = + FixtureLoader.load("transactions/V1/transfer/passphrase-with-vendor-field-hex"); - Transaction transactionV1 = new Deserializer().deserialize(fixtureV1.get("serialized").toString()); + Transaction transactionV1 = + new Deserializer().deserialize(fixtureV1.get("serialized").toString()); String actualV1 = Hex.encode(new Serializer().serialize(transactionV1)); assertEquals(fixtureV1.get("serialized").toString(), actualV1); - // V2 tests - LinkedTreeMap fixtureV2 = FixtureLoader.load("transactions/V2/transfer/passphrase-with-vendor-field-hex"); + LinkedTreeMap fixtureV2 = + FixtureLoader.load("transactions/V2/transfer/passphrase-with-vendor-field-hex"); - Transaction transactionV2 = new Deserializer().deserialize(fixtureV2.get("serialized").toString()); + Transaction transactionV2 = + new Deserializer().deserialize(fixtureV2.get("serialized").toString()); String actualV2 = Hex.encode(new Serializer().serialize(transactionV2)); assertEquals(fixtureV2.get("serialized").toString(), actualV2); @@ -75,18 +84,21 @@ void passphraseVendorFieldHex() { @Test void secondPassphrase() { // V1 tests - LinkedTreeMap fixtureV1 = FixtureLoader.load("transactions/V1/transfer/second-passphrase"); + LinkedTreeMap fixtureV1 = + FixtureLoader.load("transactions/V1/transfer/second-passphrase"); - Transaction transactionV1 = new Deserializer().deserialize(fixtureV1.get("serialized").toString()); + Transaction transactionV1 = + new Deserializer().deserialize(fixtureV1.get("serialized").toString()); String actualV1 = Hex.encode(new Serializer().serialize(transactionV1)); assertEquals(fixtureV1.get("serialized").toString(), actualV1); - // V2 tests - LinkedTreeMap fixtureV2 = FixtureLoader.load("transactions/V2/transfer/second-passphrase"); + LinkedTreeMap fixtureV2 = + FixtureLoader.load("transactions/V2/transfer/second-passphrase"); - Transaction transactionV2 = new Deserializer().deserialize(fixtureV2.get("serialized").toString()); + Transaction transactionV2 = + new Deserializer().deserialize(fixtureV2.get("serialized").toString()); String actualV2 = Hex.encode(new Serializer().serialize(transactionV2)); assertEquals(fixtureV2.get("serialized").toString(), actualV2); @@ -95,18 +107,21 @@ void secondPassphrase() { @Test void secondPassphraseVendorField() { // V1 tests - LinkedTreeMap fixtureV1 = FixtureLoader.load("transactions/V1/transfer/second-passphrase-with-vendor-field"); + LinkedTreeMap fixtureV1 = + FixtureLoader.load("transactions/V1/transfer/second-passphrase-with-vendor-field"); - Transaction transactionV1 = new Deserializer().deserialize(fixtureV1.get("serialized").toString()); + Transaction transactionV1 = + new Deserializer().deserialize(fixtureV1.get("serialized").toString()); String actualV1 = Hex.encode(new Serializer().serialize(transactionV1)); assertEquals(fixtureV1.get("serialized").toString(), actualV1); - // V2 tests - LinkedTreeMap fixtureV2 = FixtureLoader.load("transactions/V2/transfer/second-passphrase-with-vendor-field"); + LinkedTreeMap fixtureV2 = + FixtureLoader.load("transactions/V2/transfer/second-passphrase-with-vendor-field"); - Transaction transactionV2 = new Deserializer().deserialize(fixtureV2.get("serialized").toString()); + Transaction transactionV2 = + new Deserializer().deserialize(fixtureV2.get("serialized").toString()); String actualV2 = Hex.encode(new Serializer().serialize(transactionV2)); assertEquals(fixtureV2.get("serialized").toString(), actualV2); @@ -115,21 +130,25 @@ void secondPassphraseVendorField() { @Test void secondPassphraseVendorFieldHex() { // V1 tests - LinkedTreeMap fixtureV1 = FixtureLoader.load("transactions/V1/transfer/second-passphrase-with-vendor-field-hex"); + LinkedTreeMap fixtureV1 = + FixtureLoader.load( + "transactions/V1/transfer/second-passphrase-with-vendor-field-hex"); - Transaction transactionV1 = new Deserializer().deserialize(fixtureV1.get("serialized").toString()); + Transaction transactionV1 = + new Deserializer().deserialize(fixtureV1.get("serialized").toString()); String actualV1 = Hex.encode(new Serializer().serialize(transactionV1)); assertEquals(fixtureV1.get("serialized").toString(), actualV1); - // V2 tests - LinkedTreeMap fixtureV2 = FixtureLoader.load("transactions/V2/transfer/second-passphrase-with-vendor-field-hex"); + LinkedTreeMap fixtureV2 = + FixtureLoader.load( + "transactions/V2/transfer/second-passphrase-with-vendor-field-hex"); - Transaction transactionV2 = new Deserializer().deserialize(fixtureV2.get("serialized").toString()); + Transaction transactionV2 = + new Deserializer().deserialize(fixtureV2.get("serialized").toString()); String actualV2 = Hex.encode(new Serializer().serialize(transactionV2)); assertEquals(fixtureV2.get("serialized").toString(), actualV2); } - } diff --git a/src/test/java/org/arkecosystem/crypto/transactions/serializers/VoteTest.java b/src/test/java/org/arkecosystem/crypto/transactions/serializers/VoteTest.java index faa94e70..a208aaba 100644 --- a/src/test/java/org/arkecosystem/crypto/transactions/serializers/VoteTest.java +++ b/src/test/java/org/arkecosystem/crypto/transactions/serializers/VoteTest.java @@ -1,5 +1,7 @@ package org.arkecosystem.crypto.transactions.serializers; +import static org.junit.jupiter.api.Assertions.assertEquals; + import com.google.gson.internal.LinkedTreeMap; import org.arkecosystem.crypto.encoding.Hex; import org.arkecosystem.crypto.transactions.Deserializer; @@ -8,25 +10,26 @@ import org.arkecosystem.crypto.transactions.Transaction; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; - class VoteTest { @Test void passphrase() { // V1 tests - LinkedTreeMap fixtureV1 = FixtureLoader.load("transactions/V1/vote/passphrase"); + LinkedTreeMap fixtureV1 = + FixtureLoader.load("transactions/V1/vote/passphrase"); - Transaction transactionV1 = new Deserializer().deserialize(fixtureV1.get("serialized").toString()); + Transaction transactionV1 = + new Deserializer().deserialize(fixtureV1.get("serialized").toString()); String actualV1 = Hex.encode(new Serializer().serialize(transactionV1)); assertEquals(fixtureV1.get("serialized").toString(), actualV1); - // V2 tests - LinkedTreeMap fixtureV2 = FixtureLoader.load("transactions/V2/vote/passphrase"); + LinkedTreeMap fixtureV2 = + FixtureLoader.load("transactions/V2/vote/passphrase"); - Transaction transactionV2 = new Deserializer().deserialize(fixtureV2.get("serialized").toString()); + Transaction transactionV2 = + new Deserializer().deserialize(fixtureV2.get("serialized").toString()); String actualV2 = Hex.encode(new Serializer().serialize(transactionV2)); assertEquals(fixtureV2.get("serialized").toString(), actualV2); @@ -35,21 +38,23 @@ void passphrase() { @Test void secondPassphrase() { // V1 tests - LinkedTreeMap fixtureV1 = FixtureLoader.load("transactions/V1/vote/second-passphrase"); + LinkedTreeMap fixtureV1 = + FixtureLoader.load("transactions/V1/vote/second-passphrase"); - Transaction transactionV1 = new Deserializer().deserialize(fixtureV1.get("serialized").toString()); + Transaction transactionV1 = + new Deserializer().deserialize(fixtureV1.get("serialized").toString()); String actualV1 = Hex.encode(new Serializer().serialize(transactionV1)); assertEquals(fixtureV1.get("serialized").toString(), actualV1); - // V2 tests - LinkedTreeMap fixtureV2 = FixtureLoader.load("transactions/V2/vote/second-passphrase"); + LinkedTreeMap fixtureV2 = + FixtureLoader.load("transactions/V2/vote/second-passphrase"); - Transaction transactionV2 = new Deserializer().deserialize(fixtureV2.get("serialized").toString()); + Transaction transactionV2 = + new Deserializer().deserialize(fixtureV2.get("serialized").toString()); String actualV2 = Hex.encode(new Serializer().serialize(transactionV2)); assertEquals(fixtureV2.get("serialized").toString(), actualV2); } - } diff --git a/src/test/java/org/arkecosystem/crypto/utils/MessageTest.java b/src/test/java/org/arkecosystem/crypto/utils/MessageTest.java index 0a243bc2..820cdf65 100644 --- a/src/test/java/org/arkecosystem/crypto/utils/MessageTest.java +++ b/src/test/java/org/arkecosystem/crypto/utils/MessageTest.java @@ -1,18 +1,21 @@ package org.arkecosystem.crypto.utils; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.Map; - -import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.Test; class MessageTest { @Test void sign() { Message message = Message.sign("Hello World", "this is a top secret passphrase"); - assertEquals("034151a3ec46b5670a682b0a63394f863587d1bc97483b1b6c70eb58e7f0aed192", message.getPublickey()); - assertEquals("304402200fb4adddd1f1d652b544ea6ab62828a0a65b712ed447e2538db0caebfa68929e02205ecb2e1c63b29879c2ecf1255db506d671c8b3fa6017f67cfd1bf07e6edd1cc8", message.getSignature()); + assertEquals( + "034151a3ec46b5670a682b0a63394f863587d1bc97483b1b6c70eb58e7f0aed192", + message.getPublickey()); + assertEquals( + "304402200fb4adddd1f1d652b544ea6ab62828a0a65b712ed447e2538db0caebfa68929e02205ecb2e1c63b29879c2ecf1255db506d671c8b3fa6017f67cfd1bf07e6edd1cc8", + message.getSignature()); assertEquals("Hello World", message.getMessage()); } @@ -26,8 +29,12 @@ void verify() { void toMap() { Message message = Message.sign("Hello World", "this is a top secret passphrase"); Map map = message.toMap(); - assertEquals("034151a3ec46b5670a682b0a63394f863587d1bc97483b1b6c70eb58e7f0aed192", map.get("publickey")); - assertEquals("304402200fb4adddd1f1d652b544ea6ab62828a0a65b712ed447e2538db0caebfa68929e02205ecb2e1c63b29879c2ecf1255db506d671c8b3fa6017f67cfd1bf07e6edd1cc8", map.get("signature")); + assertEquals( + "034151a3ec46b5670a682b0a63394f863587d1bc97483b1b6c70eb58e7f0aed192", + map.get("publickey")); + assertEquals( + "304402200fb4adddd1f1d652b544ea6ab62828a0a65b712ed447e2538db0caebfa68929e02205ecb2e1c63b29879c2ecf1255db506d671c8b3fa6017f67cfd1bf07e6edd1cc8", + map.get("signature")); assertEquals("Hello World", map.get("message")); } @@ -35,7 +42,8 @@ void toMap() { void toJson() { Message message = Message.sign("Hello World", "this is a top secret passphrase"); String json = message.toJson(); - assertEquals("{\"signature\":\"304402200fb4adddd1f1d652b544ea6ab62828a0a65b712ed447e2538db0caebfa68929e02205ecb2e1c63b29879c2ecf1255db506d671c8b3fa6017f67cfd1bf07e6edd1cc8\",\"publickey\":\"034151a3ec46b5670a682b0a63394f863587d1bc97483b1b6c70eb58e7f0aed192\",\"message\":\"Hello World\"}", json); + assertEquals( + "{\"signature\":\"304402200fb4adddd1f1d652b544ea6ab62828a0a65b712ed447e2538db0caebfa68929e02205ecb2e1c63b29879c2ecf1255db506d671c8b3fa6017f67cfd1bf07e6edd1cc8\",\"publickey\":\"034151a3ec46b5670a682b0a63394f863587d1bc97483b1b6c70eb58e7f0aed192\",\"message\":\"Hello World\"}", + json); } - } diff --git a/src/test/java/org/arkecosystem/crypto/utils/SlotTest.java b/src/test/java/org/arkecosystem/crypto/utils/SlotTest.java index ca4e4b05..d65af18c 100644 --- a/src/test/java/org/arkecosystem/crypto/utils/SlotTest.java +++ b/src/test/java/org/arkecosystem/crypto/utils/SlotTest.java @@ -1,9 +1,9 @@ package org.arkecosystem.crypto.utils; -import org.junit.jupiter.api.Test; - import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.Test; + class SlotTest { @Test From 409ef6f660bc37cb5f24bfb1fc3c23177fe220f9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 16 Jan 2020 08:09:37 +0100 Subject: [PATCH 20/23] chore(deps): update dependency gradle to v6.1.0 (#87) Co-authored-by: WhiteSource Renovate --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c6757d65..5ef72f2e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-all.zip From 71db89a350d9313845edd43820c9856e799fd3ee Mon Sep 17 00:00:00 2001 From: Kristjan Kosic - Chris Date: Thu, 16 Jan 2020 09:31:06 +0100 Subject: [PATCH 21/23] chore(test): added actions for different java versions --- .github/workflows/test.yml | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8f9805d4..5ddda254 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,23 +1,27 @@ name: Test on: - push: - branches: - - "master" - - "develop" - pull_request: - types: [ready_for_review, synchronize, opened] + push: + branches: + - "master" + - "develop" + pull_request: + types: [ready_for_review, synchronize, opened] jobs: unit: runs-on: ubuntu-latest + strategy: + matrix: + # test against latest update of each major Java version, as well as specific updates of LTS versions: + java: [ 8, 9, 10, 11, 12, 13 ] steps: - uses: actions/checkout@v1 - - name: Set up JDK 1.8 + - name: Use Java Version ${{ matrix.java }} uses: actions/setup-java@v1 with: - java-version: 1.8 + java-version: ${{ matrix.java }} - name: Install run: gradle dependencies - name: Test From ef86d2be7d8393a5f19360a075f6705993f9d7ca Mon Sep 17 00:00:00 2001 From: Kristjan Kosic - Chris Date: Thu, 16 Jan 2020 09:35:13 +0100 Subject: [PATCH 22/23] Revert "chore(test): added actions for different java versions" This reverts commit 71db89a350d9313845edd43820c9856e799fd3ee. --- .github/workflows/test.yml | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5ddda254..8f9805d4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,27 +1,23 @@ name: Test on: - push: - branches: - - "master" - - "develop" - pull_request: - types: [ready_for_review, synchronize, opened] + push: + branches: + - "master" + - "develop" + pull_request: + types: [ready_for_review, synchronize, opened] jobs: unit: runs-on: ubuntu-latest - strategy: - matrix: - # test against latest update of each major Java version, as well as specific updates of LTS versions: - java: [ 8, 9, 10, 11, 12, 13 ] steps: - uses: actions/checkout@v1 - - name: Use Java Version ${{ matrix.java }} + - name: Set up JDK 1.8 uses: actions/setup-java@v1 with: - java-version: ${{ matrix.java }} + java-version: 1.8 - name: Install run: gradle dependencies - name: Test From 63ac1c5ef5d9e6ca5f322a758e596220f3798724 Mon Sep 17 00:00:00 2001 From: Kristjan Kosic Date: Thu, 16 Jan 2020 12:06:20 +0100 Subject: [PATCH 23/23] chore: add actions for different JDK versions (#90) --- .github/workflows/test.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8f9805d4..b7a8fd16 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,13 +11,17 @@ on: jobs: unit: runs-on: ubuntu-latest + strategy: + matrix: + # test against latest update of each major Java version, as well as specific updates of LTS versions: + java: [ 8, 9, 10, 11, 12, 13 ] steps: - uses: actions/checkout@v1 - - name: Set up JDK 1.8 + - name: Use Java Version ${{ matrix.java }} uses: actions/setup-java@v1 with: - java-version: 1.8 + java-version: ${{ matrix.java }} - name: Install run: gradle dependencies - name: Test