ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-23 14:52:29 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix build. Delete a couple of dead parameters that escaped the last cleanup.

Browse Source
This commit is contained in:
Mike Hearn 2016-08-09 16:25:35 +02:00
parent 4e0468333d
commit 7357597501
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,12 +68,12 @@ fun OpaqueBytes.sha256(): SecureHash.SHA256 = SecureHash.sha256(this.bits)
*/ */
open class DigitalSignature(bits: ByteArray) : OpaqueBytes(bits) { open class DigitalSignature(bits: ByteArray) : OpaqueBytes(bits) {
/** A digital signature that identifies who the public key is owned by. */ /** A digital signature that identifies who the public key is owned by. */
open class WithKey(val by: PublicKey, bits: ByteArray, covering: Int = 0) : DigitalSignature(bits) { open class WithKey(val by: PublicKey, bits: ByteArray) : DigitalSignature(bits) {
fun verifyWithECDSA(content: ByteArray) = by.verifyWithECDSA(content, this) fun verifyWithECDSA(content: ByteArray) = by.verifyWithECDSA(content, this)
fun verifyWithECDSA(content: OpaqueBytes) = by.verifyWithECDSA(content.bits, this) fun verifyWithECDSA(content: OpaqueBytes) = by.verifyWithECDSA(content.bits, this)
} }
class LegallyIdentifiable(val signer: Party, bits: ByteArray, covering: Int) : WithKey(signer.owningKey, bits, covering) class LegallyIdentifiable(val signer: Party, bits: ByteArray) : WithKey(signer.owningKey, bits)
} }
/** /**
@ -156,7 +156,7 @@ fun KeyPair.signWithECDSA(bitsToSign: OpaqueBytes, party: Party) = signWithECDSA
fun KeyPair.signWithECDSA(bitsToSign: ByteArray, party: Party): DigitalSignature.LegallyIdentifiable { fun KeyPair.signWithECDSA(bitsToSign: ByteArray, party: Party): DigitalSignature.LegallyIdentifiable {
check(public == party.owningKey) check(public == party.owningKey)
val sig = signWithECDSA(bitsToSign) val sig = signWithECDSA(bitsToSign)
return DigitalSignature.LegallyIdentifiable(party, sig.bits, 0) return DigitalSignature.LegallyIdentifiable(party, sig.bits)
} }
/** Utility to simplify the act of verifying a signature */ /** Utility to simplify the act of verifying a signature */

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

@ -13,7 +13,6 @@ 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 com.r3corda.protocols.RatesFixProtocol.FixOutOfRange
import java.math.BigDecimal import java.math.BigDecimal
import java.time.Duration
import java.time.Instant import java.time.Instant
import java.util.* import java.util.*
@ -32,7 +31,6 @@ open class RatesFixProtocol(protected val tx: TransactionBuilder,
private val fixOf: FixOf, private val fixOf: FixOf,
private val expectedRate: BigDecimal, private val expectedRate: BigDecimal,
private val rateTolerance: BigDecimal, private val rateTolerance: BigDecimal,
private val timeOut: Duration,
override val progressTracker: ProgressTracker = RatesFixProtocol.tracker(fixOf.name)) : ProtocolLogic<Unit>() { override val progressTracker: ProgressTracker = RatesFixProtocol.tracker(fixOf.name)) : ProtocolLogic<Unit>() {
companion object { companion object {