ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-13 04:38:19 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Convert databaseTransaction to extension function on Database. (#537)

Browse Source
This commit is contained in:
Andrzej Cichocki
2017-04-12 17:15:29 +01:00
committed by GitHub
parent 3e007c02f4
commit 88b5e32ab2
44 changed files with 290 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
docs/source/example-code/src/test/kotlin/net/corda/docs/FxTransactionBuildTutorialTest.kt
View File

@ -11,7 +11,7 @@ import net.corda.flows.CashIssueFlow
import net.corda.flows.CashPaymentFlow
import net.corda.node.services.network.NetworkMapService
import net.corda.node.services.transactions.ValidatingNotaryService
import net.corda.node.utilities.databaseTransaction
import net.corda.node.utilities.transaction
import net.corda.testing.node.MockNetwork
import org.junit.After
import org.junit.Before
@ -80,11 +80,11 @@ class FxTransactionBuildTutorialTest {
doIt.resultFuture.getOrThrow()
// Get the balances when the vault updates
nodeAVaultUpdate.get()
val balancesA = databaseTransaction(nodeA.database) {
val balancesA = nodeA.database.transaction {
nodeA.services.vaultService.cashBalances
}
nodeBVaultUpdate.get()
val balancesB = databaseTransaction(nodeB.database) {
val balancesB = nodeB.database.transaction {
nodeB.services.vaultService.cashBalances
}
println("BalanceA\n" + balancesA)
@ -98,10 +98,10 @@ class FxTransactionBuildTutorialTest {
private fun printBalances() {
// Print out the balances
databaseTransaction(nodeA.database) {
nodeA.database.transaction {
println("BalanceA\n" + nodeA.services.vaultService.cashBalances)
}
databaseTransaction(nodeB.database) {
nodeB.database.transaction {
println("BalanceB\n" + nodeB.services.vaultService.cashBalances)
}
}

10
docs/source/example-code/src/test/kotlin/net/corda/docs/WorkflowTransactionBuildTutorialTest.kt
View File

@ -13,7 +13,7 @@ import net.corda.core.utilities.DUMMY_NOTARY
import net.corda.core.utilities.DUMMY_NOTARY_KEY
import net.corda.node.services.network.NetworkMapService
import net.corda.node.services.transactions.ValidatingNotaryService
import net.corda.node.utilities.databaseTransaction
import net.corda.node.utilities.transaction
import net.corda.testing.node.MockNetwork
import org.junit.After
import org.junit.Before
@ -66,10 +66,10 @@ class WorkflowTransactionBuildTutorialTest {
// Wait for NodeB to include it's copy in the vault
nodeBVaultUpdate.get()
// Fetch the latest copy of the state from both nodes
val latestFromA = databaseTransaction(nodeA.database) {
val latestFromA = nodeA.database.transaction {
nodeA.services.latest<TradeApprovalContract.State>(proposalRef.ref)
}
val latestFromB = databaseTransaction(nodeB.database) {
val latestFromB = nodeB.database.transaction {
nodeB.services.latest<TradeApprovalContract.State>(proposalRef.ref)
}
// Confirm the state as as expected
@ -90,10 +90,10 @@ class WorkflowTransactionBuildTutorialTest {
nodeAVaultUpdate.get()
secondNodeBVaultUpdate.get()
// Fetch the latest copies from the vault
val finalFromA = databaseTransaction(nodeA.database) {
val finalFromA = nodeA.database.transaction {
nodeA.services.latest<TradeApprovalContract.State>(proposalRef.ref)
}
val finalFromB = databaseTransaction(nodeB.database) {
val finalFromB = nodeB.database.transaction {
nodeB.services.latest<TradeApprovalContract.State>(proposalRef.ref)
}
// Confirm the state is as expected