ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-21 09:51:57 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Address review comments

Browse Source
This commit is contained in:
Mike Hearn 2016-07-11 18:47:24 +02:00
parent 2be91ff516
commit e28ecae8c0
8 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
contracts/src/main/kotlin/com/r3corda/contracts/CommercialPaper.kt
View File

@ -81,12 +81,11 @@ class CommercialPaper : Contract {
val command = tx.commands.requireSingleCommand<CommercialPaper.Commands>() val command = tx.commands.requireSingleCommand<CommercialPaper.Commands>()
// If it's an issue, we can't take notary from inputs, so it must be specified in the command // If it's an issue, we can't take notary from inputs, so it must be specified in the command
val cmdVal = command.value val cmdVal = command.value
val timestamp: TimestampCommand? = if (cmdVal is Commands.Issue) val timestamp: TimestampCommand? = when (cmdVal) {
tx.getTimestampBy(cmdVal.notary) is Commands.Issue -> tx.getTimestampBy(cmdVal.notary)
else if (cmdVal is Commands.Redeem) is Commands.Redeem -> tx.getTimestampBy(cmdVal.notary)
tx.getTimestampBy(cmdVal.notary) else -> null
else }
null
for ((inputs, outputs, key) in groups) { for ((inputs, outputs, key) in groups) {
when (command.value) { when (command.value) {

2
core/src/main/kotlin/com/r3corda/core/crypto/CryptoUtilities.kt
View File

@ -19,7 +19,7 @@ fun newSecureRandom(): SecureRandom {
} }
// "sealed" here means there can't be any subclasses other than the ones defined here. // "sealed" here means there can't be any subclasses other than the ones defined here.
sealed class SecureHash constructor(bits: ByteArray) : OpaqueBytes(bits) { sealed class SecureHash(bits: ByteArray) : OpaqueBytes(bits) {
class SHA256(bits: ByteArray) : SecureHash(bits) { class SHA256(bits: ByteArray) : SecureHash(bits) {
init { init {
require(bits.size == 32) require(bits.size == 32)

2
core/src/main/kotlin/com/r3corda/protocols/FetchDataProtocol.kt
View File

@ -7,8 +7,6 @@ import com.r3corda.core.crypto.SecureHash
import com.r3corda.core.protocols.ProtocolLogic import com.r3corda.core.protocols.ProtocolLogic
import com.r3corda.core.random63BitValue import com.r3corda.core.random63BitValue
import com.r3corda.core.utilities.UntrustworthyData import com.r3corda.core.utilities.UntrustworthyData
import com.r3corda.protocols.FetchDataProtocol.DownloadedVsRequestedDataMismatch
import com.r3corda.protocols.FetchDataProtocol.HashNotFound
import java.util.* import java.util.*
/** /**

1
core/src/main/kotlin/com/r3corda/protocols/RatesFixProtocol.kt
View File

@ -11,7 +11,6 @@ import com.r3corda.core.protocols.ProtocolLogic
import com.r3corda.core.random63BitValue import com.r3corda.core.random63BitValue
import com.r3corda.core.utilities.ProgressTracker import com.r3corda.core.utilities.ProgressTracker
import com.r3corda.core.utilities.suggestInterestRateAnnouncementTimeWindow import com.r3corda.core.utilities.suggestInterestRateAnnouncementTimeWindow
import com.r3corda.protocols.RatesFixProtocol.FixOutOfRange
import java.math.BigDecimal import java.math.BigDecimal
import java.time.Duration import java.time.Duration
import java.time.Instant import java.time.Instant

2
core/src/main/kotlin/protocols/AbstractStateReplacementProtocol.kt
View File

@ -13,8 +13,6 @@ import com.r3corda.core.utilities.ProgressTracker
import com.r3corda.protocols.NotaryProtocol import com.r3corda.protocols.NotaryProtocol
import com.r3corda.protocols.PartyRequestMessage import com.r3corda.protocols.PartyRequestMessage
import com.r3corda.protocols.ResolveTransactionsProtocol import com.r3corda.protocols.ResolveTransactionsProtocol
import protocols.AbstractStateReplacementProtocol.Acceptor
import protocols.AbstractStateReplacementProtocol.Instigator
import java.security.PublicKey import java.security.PublicKey
/** /**

2
core/src/main/kotlin/protocols/NotaryChangeProtocol.kt
View File

@ -4,8 +4,6 @@ import co.paralleluniverse.fibers.Suspendable
import com.r3corda.core.contracts.* import com.r3corda.core.contracts.*
import com.r3corda.core.crypto.Party import com.r3corda.core.crypto.Party
import com.r3corda.core.utilities.ProgressTracker import com.r3corda.core.utilities.ProgressTracker
import protocols.NotaryChangeProtocol.Acceptor
import protocols.NotaryChangeProtocol.Instigator
import java.security.PublicKey import java.security.PublicKey
/** /**

1
node/src/main/kotlin/com/r3corda/node/services/network/InMemoryMessagingNetwork.kt
View File

@ -10,7 +10,6 @@ import com.r3corda.core.messaging.*
import com.r3corda.core.serialization.SingletonSerializeAsToken import com.r3corda.core.serialization.SingletonSerializeAsToken
import com.r3corda.core.utilities.loggerFor import com.r3corda.core.utilities.loggerFor
import com.r3corda.core.utilities.trace import com.r3corda.core.utilities.trace
import com.r3corda.node.services.network.InMemoryMessagingNetwork.InMemoryMessaging
import org.slf4j.LoggerFactory import org.slf4j.LoggerFactory
import rx.Observable import rx.Observable
import rx.subjects.PublishSubject import rx.subjects.PublishSubject

1
node/src/main/kotlin/com/r3corda/node/utilities/ANSIProgressRenderer.kt
View File

@ -3,7 +3,6 @@ package com.r3corda.node.utilities
import com.r3corda.core.utilities.BriefLogFormatter import com.r3corda.core.utilities.BriefLogFormatter
import com.r3corda.core.utilities.Emoji import com.r3corda.core.utilities.Emoji
import com.r3corda.core.utilities.ProgressTracker import com.r3corda.core.utilities.ProgressTracker
import com.r3corda.node.utilities.ANSIProgressRenderer.progressTracker
import org.fusesource.jansi.Ansi import org.fusesource.jansi.Ansi
import org.fusesource.jansi.AnsiConsole import org.fusesource.jansi.AnsiConsole
import org.fusesource.jansi.AnsiOutputStream import org.fusesource.jansi.AnsiOutputStream