Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade to ConsensusJ 0.5.4 #191

Merged
merged 1 commit into from Jul 4, 2020
Merged

Upgrade to ConsensusJ 0.5.4 #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.adoc
View file
Open in desktop
Expand Up @@ -55,7 +55,7 @@ Work-in-progress (but pretty much ready at this point)
* Use Gradle `java-library` plugin and declare `api` dependencies
* Gradle: Set `reproducibleFileOrder`, `preserveFileTimestamps` (helps make builds reproducible)
* TravisCI: Full build in addition to running `regTest`
* Update to ConsensusJ 0.5.2
* Update to ConsensusJ 0.5.4
* Update to bitcoinj 0.15.7 (Guava 28.2-android)
* Update to Java Money BP 1.4 (API BP 1.0.4)
* Update to Gradle 6.5
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@ consensusjBtcJsonRpcArtifact = cj-btc-jsonrpc
consensusjBtcJsonRpcGvyArtifact = cj-btc-jsonrpc-gvy
consensusjBtcCliArtifact = cj-btc-cli
consensusjBtcDslArtifact = bitcoinj-dsl
consensusjVersion = 0.5.2
consensusjVersion = 0.5.4
slf4jVersion = 1.7.30
groovyVersion = 3.0.4
spockVersion = 2.0-M3-groovy-3.0
Expand Down
1 change: 1 addition & 0 deletions omnij-rpc/src/integ/groovy/foundation/omni/BaseRegTestSpec.groovy
View file
Open in desktop
Expand Up @@ -34,6 +34,7 @@ abstract class BaseRegTestSpec extends Specification implements OmniTestClientDe
URI regTestRpcUri = recentBitcoinCore ? RpcURI.defaultRegTestURI : RpcURI.defaultTestNetURI
client = new OmniTestClient(RegTestParams.get(), regTestRpcUri, rpcTestUser, rpcTestPassword)
fundingSource = new RegTestFundingSource(client)
((RegTestFundingSource) fundingSource).checkForLegacyBitcoinCore() // Remove once we're using Bitcoin Core 0.19+
}

void setupSpec() {
Expand Down
1 change: 1 addition & 0 deletions omnij-rpc/src/main/groovy/foundation/omni/test/RegTestContext.groovy
View file
Open in desktop
Expand Up @@ -20,6 +20,7 @@ class RegTestContext {
def client = new OmniTestClient(RegTestParams.get(), regTestRpcUri, user, pass)
def env = new RegTestEnvironment(client)
def funder = new RegTestOmniFundingSource(client)
funder.checkForLegacyBitcoinCore() // Remove this line after we're based on Bitcoin Core 0.19+
return [client, env, funder]
}
}