ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-20 08:03:53 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'mnesbit-cor-174-refactor-namespaces' of https://bitbucket.org/R3-CEV/r3prototyping into mnesbit-cor-174-refactor-namespaces

Browse Source 
# Conflicts:
#	core/src/main/kotlin/core/testing/TestUtils.kt
This commit is contained in:
Matthew Nesbit
2016-05-20 16:56:41 +01:00
parent 1d5f409c66 c6b788f792
commit d1e8d15d9d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/kotlin/core/testing/TestUtils.kt
View File

@ -146,7 +146,7 @@ open class TransactionForTest : AbstractTransactionForTest() {
protected fun runCommandsAndVerify(time: Instant) { protected fun runCommandsAndVerify(time: Instant) {
val cmds = commandsToAuthenticatedObjects() val cmds = commandsToAuthenticatedObjects()
val tx = TransactionForVerification(inStates, outStates.map { it.state }, emptyList(), cmds, SecureHash.randomSHA256()) val tx = TransactionForVerification(inStates, outStates.map { it.state }, emptyList(), cmds, SecureHash.Companion.randomSHA256())
tx.verify() tx.verify()
} }

6
node/src/test/kotlin/node/services/NotaryServiceTests.kt
View File

@ -37,7 +37,7 @@ class NotaryServiceTests {
tx.setTime(Instant.now(), DUMMY_NOTARY, 30.seconds) tx.setTime(Instant.now(), DUMMY_NOTARY, 30.seconds)
var wtx = tx.toWireTransaction() var wtx = tx.toWireTransaction()
val protocol = NotaryProtocol(wtx, NotaryProtocol.tracker()) val protocol = NotaryProtocol(wtx, NotaryProtocol.Companion.tracker())
val future = clientNode.smm.add(NotaryProtocol.TOPIC, protocol) val future = clientNode.smm.add(NotaryProtocol.TOPIC, protocol)
net.runNetwork() net.runNetwork()
@ -49,7 +49,7 @@ class NotaryServiceTests {
val inputState = issueState(clientNode) val inputState = issueState(clientNode)
val wtx = TransactionBuilder().withItems(inputState).toWireTransaction() val wtx = TransactionBuilder().withItems(inputState).toWireTransaction()
val protocol = NotaryProtocol(wtx, NotaryProtocol.tracker()) val protocol = NotaryProtocol(wtx, NotaryProtocol.Companion.tracker())
val future = clientNode.smm.add(NotaryProtocol.TOPIC, protocol) val future = clientNode.smm.add(NotaryProtocol.TOPIC, protocol)
net.runNetwork() net.runNetwork()
@ -63,7 +63,7 @@ class NotaryServiceTests {
tx.setTime(Instant.now().plusSeconds(3600), DUMMY_NOTARY, 30.seconds) tx.setTime(Instant.now().plusSeconds(3600), DUMMY_NOTARY, 30.seconds)
var wtx = tx.toWireTransaction() var wtx = tx.toWireTransaction()
val protocol = NotaryProtocol(wtx, NotaryProtocol.tracker()) val protocol = NotaryProtocol(wtx, NotaryProtocol.Companion.tracker())
val future = clientNode.smm.add(NotaryProtocol.TOPIC, protocol) val future = clientNode.smm.add(NotaryProtocol.TOPIC, protocol)
net.runNetwork() net.runNetwork()