Skip to content

Added vault query as tokenizable service. #926

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

Merged
josecoll merged 4 commits into from
Jun 27, 2017
Merged

Added vault query as tokenizable service. #926

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
23765aa
Added vault query as tokenizable service.
Jun 27, 2017
ff62081
Add JUnit test to test access of vault query service within a flow.
Jun 27, 2017
e2014b0
Improved JUnit test to correctly validate tokenizable behaviour.
Jun 27, 2017
c674b07
Minor cleanup
Jun 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Improved JUnit test to correctly validate tokenizable behaviour.
  • Loading branch information
josecoll committed Jun 27, 2017
commit e2014b01dacdf6205ee28754fe3c5c271130c7d0
22 changes: 18 additions & 4 deletions node/src/test/kotlin/net/corda/node/services/statemachine/FlowFrameworkTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,8 +598,16 @@ class FlowFrameworkTests {
}

@Test
fun `access vault query service within a flow`() {
val result = node2.services.startFlow(VaultQueryFlow()).resultFuture
fun `verify vault query service is tokenizable by force checkpointing within a flow`() {
val ptx = TransactionBuilder(notary = notary1.info.notaryIdentity)
ptx.addOutputState(DummyState())
val stx = node1.services.signInitialTransaction(ptx)

node1.registerFlowFactory(VaultQueryFlow::class) {
WaitingFlows.Committer(it)
}.map { it.stateMachine }
Copy link
Contributor

@shamsasari shamsasari Jun 27, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You don't need to do the map

val result = node2.services.startFlow(VaultQueryFlow(stx, node1.info.legalIdentity)).resultFuture

mockNet.runNetwork()
assertThat(result.getOrThrow()).isEmpty()
}
Expand Down Expand Up @@ -870,10 +878,16 @@ class FlowFrameworkTests {
}
Copy link
Contributor

@shamsasari shamsasari Jun 27, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd take this opportunity to delete this test

}

private class VaultQueryFlow : FlowLogic<List<StateAndRef<ContractState>>>() {
@InitiatingFlow
private class VaultQueryFlow(val stx: SignedTransaction, val otherParty: Party) : FlowLogic<List<StateAndRef<ContractState>>>() {
@Suspendable
override fun call(): List<StateAndRef<ContractState>> {
return serviceHub.vaultQueryService.queryBy<ContractState>().states
send(otherParty, stx)
// hold onto reference here to force checkpoint of vaultQueryService and thus
// prove it is registered as a tokenizableService in the node
val vaultQuerySvc = serviceHub.vaultQueryService
waitForLedgerCommit(stx.id)
return vaultQuerySvc.queryBy<ContractState>().states
}
}

Expand Down