ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-21 22:07:55 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Remove unnecessary .Companion statements brought in during refactoring.

Browse Source
This commit is contained in:
Matthew Nesbit 2016-05-20 16:39:35 +01:00
parent 45f67a4f8c
commit 1d5f409c66
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contracts/src/main/java/contracts/JavaCommercialPaper.java
View File

@ -88,7 +88,7 @@ public class JavaCommercialPaper implements Contract {
@Override @Override
public Contract getContract() { public Contract getContract() {
return JCP_PROGRAM_ID; return JCP_PROGRAM_ID;
//return SecureHash.Companion.sha256("java commercial paper (this should be a bytecode hash)"); //return SecureHash.sha256("java commercial paper (this should be a bytecode hash)");
} }
@Override @Override

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

@ -73,7 +73,7 @@ val ALL_TEST_KEYS = listOf(MEGA_CORP_KEY, MINI_CORP_KEY, ALICE_KEY, BOB_KEY, DUM
val MOCK_IDENTITY_SERVICE = MockIdentityService(listOf(MEGA_CORP, MINI_CORP, DUMMY_NOTARY)) val MOCK_IDENTITY_SERVICE = MockIdentityService(listOf(MEGA_CORP, MINI_CORP, DUMMY_NOTARY))
fun generateStateRef() = StateRef(SecureHash.Companion.randomSHA256(), 0) fun generateStateRef() = StateRef(SecureHash.randomSHA256(), 0)
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// //
@ -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.Companion.randomSHA256()) val tx = TransactionForVerification(inStates, outStates.map { it.state }, emptyList(), cmds, SecureHash.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.Companion.tracker()) val protocol = NotaryProtocol(wtx, NotaryProtocol.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.Companion.tracker()) val protocol = NotaryProtocol(wtx, NotaryProtocol.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.Companion.tracker()) val protocol = NotaryProtocol(wtx, NotaryProtocol.tracker())
val future = clientNode.smm.add(NotaryProtocol.TOPIC, protocol) val future = clientNode.smm.add(NotaryProtocol.TOPIC, protocol)
net.runNetwork() net.runNetwork()