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

Revert Party.Full in preference for a less invasive change

Browse Source
This commit is contained in:
Ross Nicoll
2017-02-01 17:05:28 +00:00
parent 8b258b9415
commit 2f9af7d7dc
137 changed files with 410 additions and 414 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/trader-demo/src/main/kotlin/net/corda/traderdemo/flow/BuyerFlow.kt
View File

@ -17,7 +17,7 @@ import net.corda.node.services.persistence.NodeAttachmentService
import java.nio.file.Path
import java.util.*
class BuyerFlow(val otherParty: Party.Full,
class BuyerFlow(val otherParty: Party,
private val attachmentsPath: Path,
override val progressTracker: ProgressTracker = ProgressTracker(STARTING_BUY)) : FlowLogic<Unit>() {

6
samples/trader-demo/src/main/kotlin/net/corda/traderdemo/flow/SellerFlow.kt
View File

@ -16,10 +16,10 @@ import net.corda.flows.TwoPartyTradeFlow
import java.time.Instant
import java.util.*
class SellerFlow(val otherParty: Party.Full,
class SellerFlow(val otherParty: Party,
val amount: Amount<Currency>,
override val progressTracker: ProgressTracker) : FlowLogic<SignedTransaction>() {
constructor(otherParty: Party.Full, amount: Amount<Currency>) : this(otherParty, amount, tracker())
constructor(otherParty: Party, amount: Amount<Currency>) : this(otherParty, amount, tracker())
companion object {
val PROSPECTUS_HASH = SecureHash.parse("decd098666b9657314870e192ced0c3519c2c9d395507a238338f8d003929de9")
@ -65,7 +65,7 @@ class SellerFlow(val otherParty: Party.Full,
fun selfIssueSomeCommercialPaper(ownedBy: CompositeKey, notaryNode: NodeInfo): StateAndRef<CommercialPaper.State> {
// Make a fake company that's issued its own paper.
val keyPair = generateKeyPair()
val party = Party.Full("Bank of London", keyPair.public)
val party = Party("Bank of London", keyPair.public)
val issuance: SignedTransaction = run {
val tx = CommercialPaper().generateIssue(party.ref(1, 2, 3), 1100.DOLLARS `issued by` DUMMY_CASH_ISSUER,

2
samples/trader-demo/src/main/kotlin/net/corda/traderdemo/plugin/TraderDemoPlugin.kt
View File

@ -12,7 +12,7 @@ import java.util.function.Function
class TraderDemoPlugin : CordaPluginRegistry() {
// A list of Flows that are required for this cordapp
override val requiredFlows: Map<String, Set<String>> = mapOf(
SellerFlow::class.java.name to setOf(Party.Full::class.java.name, Amount::class.java.name)
SellerFlow::class.java.name to setOf(Party::class.java.name, Amount::class.java.name)
)
override val servicePlugins = listOf(Function(BuyerFlow::Service))
}