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

Rename finance module to own package

Browse Source 
Fixup after rebase

Correct bad merges

Fixup docs

Fix integration test

Correct doc references to finance
This commit is contained in:
Matthew Nesbit 2017-08-21 16:40:28 +01:00
parent 09adba8275
commit c86e78599f
148 changed files with 454 additions and 429 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
client/jfx/src/integration-test/kotlin/net/corda/client/jfx/NodeMonitorModelTest.kt
View File

@ -2,15 +2,13 @@ package net.corda.client.jfx
import net.corda.client.jfx.model.NodeMonitorModel import net.corda.client.jfx.model.NodeMonitorModel
import net.corda.client.jfx.model.ProgressTrackingEvent import net.corda.client.jfx.model.ProgressTrackingEvent
import net.corda.core.internal.bufferUntilSubscribed
import net.corda.core.contracts.Amount import net.corda.core.contracts.Amount
import net.corda.core.contracts.ContractState import net.corda.core.contracts.ContractState
import net.corda.finance.DOLLARS
import net.corda.finance.USD
import net.corda.core.crypto.isFulfilledBy import net.corda.core.crypto.isFulfilledBy
import net.corda.core.crypto.keys import net.corda.core.crypto.keys
import net.corda.core.flows.FlowInitiator import net.corda.core.flows.FlowInitiator
import net.corda.core.flows.StateMachineRunId import net.corda.core.flows.StateMachineRunId
import net.corda.core.internal.bufferUntilSubscribed
import net.corda.core.messaging.CordaRPCOps import net.corda.core.messaging.CordaRPCOps
import net.corda.core.messaging.StateMachineTransactionMapping import net.corda.core.messaging.StateMachineTransactionMapping
import net.corda.core.messaging.StateMachineUpdate import net.corda.core.messaging.StateMachineUpdate
@ -22,9 +20,11 @@ import net.corda.core.node.services.Vault
import net.corda.core.transactions.SignedTransaction import net.corda.core.transactions.SignedTransaction
import net.corda.core.utilities.OpaqueBytes import net.corda.core.utilities.OpaqueBytes
import net.corda.core.utilities.getOrThrow import net.corda.core.utilities.getOrThrow
import net.corda.flows.CashExitFlow import net.corda.finance.DOLLARS
import net.corda.flows.CashIssueFlow import net.corda.finance.USD
import net.corda.flows.CashPaymentFlow import net.corda.finance.flows.CashExitFlow
import net.corda.finance.flows.CashIssueFlow
import net.corda.finance.flows.CashPaymentFlow
import net.corda.node.services.network.NetworkMapService import net.corda.node.services.network.NetworkMapService
import net.corda.node.services.startFlowPermission import net.corda.node.services.startFlowPermission
import net.corda.node.services.transactions.SimpleNotaryService import net.corda.node.services.transactions.SimpleNotaryService

2
client/jfx/src/main/kotlin/net/corda/client/jfx/model/ContractStateModel.kt
View File

@ -4,10 +4,10 @@ import javafx.collections.FXCollections
import javafx.collections.ObservableList import javafx.collections.ObservableList
import net.corda.client.jfx.utils.fold import net.corda.client.jfx.utils.fold
import net.corda.client.jfx.utils.map import net.corda.client.jfx.utils.map
import net.corda.contracts.asset.Cash
import net.corda.core.contracts.ContractState import net.corda.core.contracts.ContractState
import net.corda.core.contracts.StateAndRef import net.corda.core.contracts.StateAndRef
import net.corda.core.node.services.Vault import net.corda.core.node.services.Vault
import net.corda.finance.contracts.asset.Cash
import rx.Observable import rx.Observable
data class Diff<out T : ContractState>( data class Diff<out T : ContractState>(

10
client/mock/src/main/kotlin/net/corda/client/mock/EventGenerator.kt
View File

@ -1,14 +1,14 @@
package net.corda.client.mock package net.corda.client.mock
import net.corda.core.contracts.Amount import net.corda.core.contracts.Amount
import net.corda.finance.GBP
import net.corda.finance.USD
import net.corda.core.identity.Party import net.corda.core.identity.Party
import net.corda.core.utilities.OpaqueBytes import net.corda.core.utilities.OpaqueBytes
import net.corda.finance.GBP
import net.corda.finance.USD
import java.util.* import java.util.*
import net.corda.flows.CashIssueAndPaymentFlow.IssueAndPaymentRequest import net.corda.finance.flows.CashIssueAndPaymentFlow.IssueAndPaymentRequest
import net.corda.flows.CashExitFlow.ExitRequest import net.corda.finance.flows.CashExitFlow.ExitRequest
import net.corda.flows.CashPaymentFlow.PaymentRequest import net.corda.finance.flows.CashPaymentFlow.PaymentRequest
/** /**
* [Generator]s for incoming/outgoing cash flow events between parties. It doesn't necessarily generate correct events! * [Generator]s for incoming/outgoing cash flow events between parties. It doesn't necessarily generate correct events!

8
client/rpc/src/integration-test/java/net/corda/client/rpc/CordaRPCJavaClientTest.java
View File

@ -7,9 +7,9 @@ import net.corda.core.messaging.CordaRPCOps;
import net.corda.core.messaging.FlowHandle; import net.corda.core.messaging.FlowHandle;
import net.corda.core.node.services.ServiceInfo; import net.corda.core.node.services.ServiceInfo;
import net.corda.core.utilities.OpaqueBytes; import net.corda.core.utilities.OpaqueBytes;
import net.corda.flows.AbstractCashFlow; import net.corda.finance.flows.AbstractCashFlow;
import net.corda.flows.CashIssueFlow; import net.corda.finance.flows.CashIssueFlow;
import net.corda.flows.CashPaymentFlow; import net.corda.finance.flows.CashPaymentFlow;
import net.corda.node.internal.Node; import net.corda.node.internal.Node;
import net.corda.node.services.transactions.ValidatingNotaryService; import net.corda.node.services.transactions.ValidatingNotaryService;
import net.corda.nodeapi.User; import net.corda.nodeapi.User;
@ -27,8 +27,8 @@ import static java.util.Collections.singletonList;
import static java.util.Objects.requireNonNull; import static java.util.Objects.requireNonNull;
import static kotlin.test.AssertionsKt.assertEquals; import static kotlin.test.AssertionsKt.assertEquals;
import static net.corda.client.rpc.CordaRPCClientConfiguration.getDefault; import static net.corda.client.rpc.CordaRPCClientConfiguration.getDefault;
import static net.corda.contracts.GetBalances.getCashBalance;
import static net.corda.finance.CurrencyUtils.DOLLARS; import static net.corda.finance.CurrencyUtils.DOLLARS;
import static net.corda.finance.contracts.GetBalances.getCashBalance;
import static net.corda.node.services.RPCUserServiceKt.startFlowPermission; import static net.corda.node.services.RPCUserServiceKt.startFlowPermission;
import static net.corda.testing.TestConstants.getALICE; import static net.corda.testing.TestConstants.getALICE;

14
client/rpc/src/integration-test/kotlin/net/corda/client/rpc/CordaRPCClientTest.kt
View File

@ -1,18 +1,18 @@
package net.corda.client.rpc package net.corda.client.rpc
import net.corda.contracts.getCashBalance
import net.corda.contracts.getCashBalances
import net.corda.finance.DOLLARS
import net.corda.finance.USD
import net.corda.core.crypto.random63BitValue import net.corda.core.crypto.random63BitValue
import net.corda.core.flows.FlowInitiator import net.corda.core.flows.FlowInitiator
import net.corda.core.messaging.* import net.corda.core.messaging.*
import net.corda.core.node.services.ServiceInfo import net.corda.core.node.services.ServiceInfo
import net.corda.core.utilities.OpaqueBytes import net.corda.core.utilities.OpaqueBytes
import net.corda.core.utilities.getOrThrow import net.corda.core.utilities.getOrThrow
import net.corda.flows.CashException import net.corda.finance.DOLLARS
import net.corda.flows.CashIssueFlow import net.corda.finance.USD
import net.corda.flows.CashPaymentFlow import net.corda.finance.contracts.getCashBalance
import net.corda.finance.contracts.getCashBalances
import net.corda.finance.flows.CashException
import net.corda.finance.flows.CashIssueFlow
import net.corda.finance.flows.CashPaymentFlow
import net.corda.node.internal.Node import net.corda.node.internal.Node
import net.corda.node.services.startFlowPermission import net.corda.node.services.startFlowPermission
import net.corda.node.services.transactions.ValidatingNotaryService import net.corda.node.services.transactions.ValidatingNotaryService

8
client/rpc/src/smoke-test/java/net/corda/java/rpc/StandaloneCordaRPCJavaClientTest.java
View File

@ -3,13 +3,11 @@ package net.corda.java.rpc;
import net.corda.client.rpc.CordaRPCConnection; import net.corda.client.rpc.CordaRPCConnection;
import net.corda.core.contracts.Amount; import net.corda.core.contracts.Amount;
import net.corda.core.messaging.CordaRPCOps; import net.corda.core.messaging.CordaRPCOps;
import net.corda.core.messaging.DataFeed;
import net.corda.core.messaging.FlowHandle; import net.corda.core.messaging.FlowHandle;
import net.corda.core.node.NodeInfo; import net.corda.core.node.NodeInfo;
import net.corda.core.node.services.NetworkMapCache;
import net.corda.core.utilities.OpaqueBytes; import net.corda.core.utilities.OpaqueBytes;
import net.corda.flows.AbstractCashFlow; import net.corda.finance.flows.AbstractCashFlow;
import net.corda.flows.CashIssueFlow; import net.corda.finance.flows.CashIssueFlow;
import net.corda.nodeapi.User; import net.corda.nodeapi.User;
import net.corda.smoketesting.NodeConfig; import net.corda.smoketesting.NodeConfig;
import net.corda.smoketesting.NodeProcess; import net.corda.smoketesting.NodeProcess;
@ -29,7 +27,7 @@ import java.util.stream.Stream;
import static kotlin.test.AssertionsKt.assertEquals; import static kotlin.test.AssertionsKt.assertEquals;
import static kotlin.test.AssertionsKt.fail; import static kotlin.test.AssertionsKt.fail;
import static net.corda.contracts.GetBalances.getCashBalance; import static net.corda.finance.contracts.GetBalances.getCashBalance;
public class StandaloneCordaRPCJavaClientTest { public class StandaloneCordaRPCJavaClientTest {
private List<String> perms = Collections.singletonList("ALL"); private List<String> perms = Collections.singletonList("ALL");

10
client/rpc/src/smoke-test/kotlin/net/corda/kotlin/rpc/StandaloneCordaRPClientTest.kt
View File

@ -3,9 +3,6 @@ package net.corda.kotlin.rpc
import com.google.common.hash.Hashing import com.google.common.hash.Hashing
import com.google.common.hash.HashingInputStream import com.google.common.hash.HashingInputStream
import net.corda.client.rpc.CordaRPCConnection import net.corda.client.rpc.CordaRPCConnection
import net.corda.contracts.asset.Cash
import net.corda.contracts.getCashBalance
import net.corda.contracts.getCashBalances
import net.corda.core.crypto.SecureHash import net.corda.core.crypto.SecureHash
import net.corda.core.internal.* import net.corda.core.internal.*
import net.corda.core.messaging.* import net.corda.core.messaging.*
@ -20,8 +17,11 @@ import net.corda.finance.DOLLARS
import net.corda.finance.POUNDS import net.corda.finance.POUNDS
import net.corda.finance.SWISS_FRANCS import net.corda.finance.SWISS_FRANCS
import net.corda.finance.USD import net.corda.finance.USD
import net.corda.flows.CashIssueFlow import net.corda.finance.contracts.asset.Cash
import net.corda.flows.CashPaymentFlow import net.corda.finance.contracts.getCashBalance
import net.corda.finance.contracts.getCashBalances
import net.corda.finance.flows.CashIssueFlow
import net.corda.finance.flows.CashPaymentFlow
import net.corda.nodeapi.User import net.corda.nodeapi.User
import net.corda.smoketesting.NodeConfig import net.corda.smoketesting.NodeConfig
import net.corda.smoketesting.NodeProcess import net.corda.smoketesting.NodeProcess

2
core/src/test/kotlin/net/corda/core/contracts/TransactionEncumbranceTests.kt
View File

@ -1,10 +1,10 @@
package net.corda.core.contracts package net.corda.core.contracts
import net.corda.contracts.asset.Cash
import net.corda.core.identity.AbstractParty import net.corda.core.identity.AbstractParty
import net.corda.core.transactions.LedgerTransaction import net.corda.core.transactions.LedgerTransaction
import net.corda.finance.DOLLARS import net.corda.finance.DOLLARS
import net.corda.finance.`issued by` import net.corda.finance.`issued by`
import net.corda.finance.contracts.asset.Cash
import net.corda.testing.MEGA_CORP import net.corda.testing.MEGA_CORP
import net.corda.testing.MINI_CORP import net.corda.testing.MINI_CORP
import net.corda.testing.ledger import net.corda.testing.ledger

2
core/src/test/kotlin/net/corda/core/contracts/TransactionTests.kt
View File

@ -1,12 +1,12 @@
package net.corda.core.contracts package net.corda.core.contracts
import net.corda.contracts.asset.DUMMY_CASH_ISSUER_KEY
import net.corda.core.crypto.* import net.corda.core.crypto.*
import net.corda.core.crypto.composite.CompositeKey import net.corda.core.crypto.composite.CompositeKey
import net.corda.core.identity.Party import net.corda.core.identity.Party
import net.corda.core.transactions.LedgerTransaction import net.corda.core.transactions.LedgerTransaction
import net.corda.core.transactions.SignedTransaction import net.corda.core.transactions.SignedTransaction
import net.corda.core.transactions.WireTransaction import net.corda.core.transactions.WireTransaction
import net.corda.finance.contracts.asset.DUMMY_CASH_ISSUER_KEY
import net.corda.testing.* import net.corda.testing.*
import net.corda.testing.contracts.DummyContract import net.corda.testing.contracts.DummyContract
import org.junit.Test import org.junit.Test

2
core/src/test/kotlin/net/corda/core/crypto/PartialMerkleTreeTest.kt
View File

@ -1,7 +1,6 @@
package net.corda.core.crypto package net.corda.core.crypto
import net.corda.contracts.asset.Cash
import net.corda.core.contracts.* import net.corda.core.contracts.*
import net.corda.core.crypto.SecureHash.Companion.zeroHash import net.corda.core.crypto.SecureHash.Companion.zeroHash
import net.corda.core.identity.Party import net.corda.core.identity.Party
@ -10,6 +9,7 @@ import net.corda.core.serialization.serialize
import net.corda.core.transactions.WireTransaction import net.corda.core.transactions.WireTransaction
import net.corda.finance.DOLLARS import net.corda.finance.DOLLARS
import net.corda.finance.`issued by` import net.corda.finance.`issued by`
import net.corda.finance.contracts.asset.Cash
import net.corda.testing.* import net.corda.testing.*
import org.junit.Test import org.junit.Test
import java.security.PublicKey import java.security.PublicKey

4
core/src/test/kotlin/net/corda/core/flows/ContractUpgradeFlowTest.kt
View File

@ -1,7 +1,6 @@
package net.corda.core.flows package net.corda.core.flows
import co.paralleluniverse.fibers.Suspendable import co.paralleluniverse.fibers.Suspendable
import net.corda.contracts.asset.Cash
import net.corda.core.contracts.* import net.corda.core.contracts.*
import net.corda.core.identity.AbstractParty import net.corda.core.identity.AbstractParty
import net.corda.core.identity.Party import net.corda.core.identity.Party
@ -15,7 +14,8 @@ import net.corda.core.utilities.OpaqueBytes
import net.corda.core.utilities.getOrThrow import net.corda.core.utilities.getOrThrow
import net.corda.finance.USD import net.corda.finance.USD
import net.corda.finance.`issued by` import net.corda.finance.`issued by`
import net.corda.flows.CashIssueFlow import net.corda.finance.contracts.asset.Cash
import net.corda.finance.flows.CashIssueFlow
import net.corda.node.internal.CordaRPCOpsImpl import net.corda.node.internal.CordaRPCOpsImpl
import net.corda.node.services.startFlowPermission import net.corda.node.services.startFlowPermission
import net.corda.nodeapi.User import net.corda.nodeapi.User

4
core/src/test/kotlin/net/corda/core/flows/FinalityFlowTests.kt
View File

@ -1,12 +1,12 @@
package net.corda.core.flows package net.corda.core.flows
import net.corda.contracts.asset.Cash
import net.corda.core.contracts.Amount import net.corda.core.contracts.Amount
import net.corda.finance.GBP
import net.corda.core.contracts.Issued import net.corda.core.contracts.Issued
import net.corda.core.identity.Party import net.corda.core.identity.Party
import net.corda.core.transactions.TransactionBuilder import net.corda.core.transactions.TransactionBuilder
import net.corda.core.utilities.getOrThrow import net.corda.core.utilities.getOrThrow
import net.corda.finance.GBP
import net.corda.finance.contracts.asset.Cash
import net.corda.testing.node.MockNetwork import net.corda.testing.node.MockNetwork
import net.corda.testing.node.MockServices import net.corda.testing.node.MockServices
import org.junit.After import org.junit.After

4
core/src/test/kotlin/net/corda/core/flows/ManualFinalityFlowTests.kt
View File

@ -1,12 +1,12 @@
package net.corda.core.flows package net.corda.core.flows
import net.corda.contracts.asset.Cash
import net.corda.core.contracts.Amount import net.corda.core.contracts.Amount
import net.corda.finance.GBP
import net.corda.core.contracts.Issued import net.corda.core.contracts.Issued
import net.corda.core.identity.Party import net.corda.core.identity.Party
import net.corda.core.transactions.TransactionBuilder import net.corda.core.transactions.TransactionBuilder
import net.corda.core.utilities.getOrThrow import net.corda.core.utilities.getOrThrow
import net.corda.finance.GBP
import net.corda.finance.contracts.asset.Cash
import net.corda.testing.node.MockNetwork import net.corda.testing.node.MockNetwork
import net.corda.testing.node.MockServices import net.corda.testing.node.MockServices
import org.junit.After import org.junit.After

2
docs/source/api-persistence.rst
View File

@ -90,7 +90,7 @@ in order to initialise the ORM layer.
Several examples of entities and mappings are provided in the codebase, including ``Cash.State`` and Several examples of entities and mappings are provided in the codebase, including ``Cash.State`` and
``CommercialPaper.State``. For example, here's the first version of the cash schema. ``CommercialPaper.State``. For example, here's the first version of the cash schema.
.. literalinclude:: ../../finance/src/main/kotlin/net/corda/schemas/CashSchemaV1.kt .. literalinclude:: ../../finance/src/main/kotlin/net/corda/finance/schemas/CashSchemaV1.kt
:language: kotlin :language: kotlin
Identity mapping Identity mapping

2
docs/source/api-states.rst
View File

@ -129,7 +129,7 @@ For example, here is a relatively complex state definition, for a state represen
.. container:: codeset .. container:: codeset
.. literalinclude:: ../../finance/src/main/kotlin/net/corda/contracts/asset/Cash.kt .. literalinclude:: ../../finance/src/main/kotlin/net/corda/finance/contracts/asset/Cash.kt
:language: kotlin :language: kotlin
:start-after: DOCSTART 1 :start-after: DOCSTART 1
:end-before: DOCEND 1 :end-before: DOCEND 1

3
docs/source/changelog.rst
View File

@ -61,6 +61,9 @@ UNRELEASED
* ``WebServerPluginRegistry`` now has a ``customizeJSONSerialization`` which can be overridden to extend the REST JSON * ``WebServerPluginRegistry`` now has a ``customizeJSONSerialization`` which can be overridden to extend the REST JSON
serializers. In particular the IRS demos must now register the ``BusinessCalendar`` serializers. serializers. In particular the IRS demos must now register the ``BusinessCalendar`` serializers.
* Moved ``:finance`` gradle project files into a ``net.corda.finance`` package namespace.
This may require adjusting imports of Cash flow references and also of ``StartFlow`` permission in ``gradle.build`` files.
Milestone 14 Milestone 14
------------ ------------

2
docs/source/example-code/build.gradle
View File

@ -89,7 +89,7 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
rpcUsers = [ rpcUsers = [
['username' : "user", ['username' : "user",
'password' : "password", 'password' : "password",
'permissions' : ["StartFlow.net.corda.flows.CashFlow"]] 'permissions' : ["StartFlow.net.corda.finance.flows.CashFlow"]]
] ]
} }
} }

6
docs/source/example-code/src/integration-test/kotlin/net/corda/docs/IntegrationTestingTutorial.kt
View File

@ -1,6 +1,5 @@
package net.corda.docs package net.corda.docs
import net.corda.contracts.asset.Cash
import net.corda.core.internal.concurrent.transpose import net.corda.core.internal.concurrent.transpose
import net.corda.core.messaging.startFlow import net.corda.core.messaging.startFlow
import net.corda.core.messaging.vaultTrackBy import net.corda.core.messaging.vaultTrackBy
@ -9,8 +8,9 @@ import net.corda.core.node.services.Vault
import net.corda.core.utilities.OpaqueBytes import net.corda.core.utilities.OpaqueBytes
import net.corda.core.utilities.getOrThrow import net.corda.core.utilities.getOrThrow
import net.corda.finance.DOLLARS import net.corda.finance.DOLLARS
import net.corda.flows.CashIssueFlow import net.corda.finance.contracts.asset.Cash
import net.corda.flows.CashPaymentFlow import net.corda.finance.flows.CashIssueFlow
import net.corda.finance.flows.CashPaymentFlow
import net.corda.node.services.startFlowPermission import net.corda.node.services.startFlowPermission
import net.corda.node.services.transactions.ValidatingNotaryService import net.corda.node.services.transactions.ValidatingNotaryService
import net.corda.nodeapi.User import net.corda.nodeapi.User

2
docs/source/example-code/src/main/java/net/corda/docs/FlowCookbookJava.java
View File

@ -3,7 +3,6 @@ package net.corda.docs;
import co.paralleluniverse.fibers.Suspendable; import co.paralleluniverse.fibers.Suspendable;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import net.corda.contracts.asset.Cash;
import net.corda.core.contracts.*; import net.corda.core.contracts.*;
import net.corda.core.crypto.SecureHash; import net.corda.core.crypto.SecureHash;
import net.corda.core.crypto.TransactionSignature; import net.corda.core.crypto.TransactionSignature;
@ -21,6 +20,7 @@ import net.corda.core.transactions.WireTransaction;
import net.corda.core.utilities.ProgressTracker; import net.corda.core.utilities.ProgressTracker;
import net.corda.core.utilities.ProgressTracker.Step; import net.corda.core.utilities.ProgressTracker.Step;
import net.corda.core.utilities.UntrustworthyData; import net.corda.core.utilities.UntrustworthyData;
import net.corda.finance.contracts.asset.Cash;
import net.corda.testing.contracts.DummyContract; import net.corda.testing.contracts.DummyContract;
import net.corda.testing.contracts.DummyState; import net.corda.testing.contracts.DummyState;
import org.bouncycastle.asn1.x500.X500Name; import org.bouncycastle.asn1.x500.X500Name;

11
docs/source/example-code/src/main/kotlin/net/corda/docs/ClientRpcTutorial.kt
View File

@ -1,9 +1,6 @@
package net.corda.docs package net.corda.docs
import net.corda.client.rpc.notUsed
import net.corda.contracts.asset.Cash
import net.corda.core.contracts.Amount import net.corda.core.contracts.Amount
import net.corda.finance.USD
import net.corda.core.messaging.CordaRPCOps import net.corda.core.messaging.CordaRPCOps
import net.corda.core.messaging.startFlow import net.corda.core.messaging.startFlow
import net.corda.core.messaging.vaultQueryBy import net.corda.core.messaging.vaultQueryBy
@ -13,9 +10,11 @@ import net.corda.core.serialization.CordaSerializable
import net.corda.core.serialization.SerializationCustomization import net.corda.core.serialization.SerializationCustomization
import net.corda.core.transactions.SignedTransaction import net.corda.core.transactions.SignedTransaction
import net.corda.core.utilities.OpaqueBytes import net.corda.core.utilities.OpaqueBytes
import net.corda.flows.CashExitFlow import net.corda.finance.USD
import net.corda.flows.CashIssueFlow import net.corda.finance.contracts.asset.Cash
import net.corda.flows.CashPaymentFlow import net.corda.finance.flows.CashExitFlow
import net.corda.finance.flows.CashIssueFlow
import net.corda.finance.flows.CashPaymentFlow
import net.corda.node.services.startFlowPermission import net.corda.node.services.startFlowPermission
import net.corda.node.services.transactions.ValidatingNotaryService import net.corda.node.services.transactions.ValidatingNotaryService
import net.corda.nodeapi.User import net.corda.nodeapi.User

5
docs/source/example-code/src/main/kotlin/net/corda/docs/CustomVaultQuery.kt
View File

@ -16,7 +16,10 @@ import net.corda.core.utilities.OpaqueBytes
import net.corda.core.utilities.ProgressTracker import net.corda.core.utilities.ProgressTracker
import net.corda.core.utilities.loggerFor import net.corda.core.utilities.loggerFor
import net.corda.core.utilities.unwrap import net.corda.core.utilities.unwrap
import net.corda.flows.* import net.corda.finance.flows.AbstractCashFlow
import net.corda.finance.flows.CashException
import net.corda.finance.flows.CashIssueFlow
import net.corda.finance.flows.CashPaymentFlow
import java.util.* import java.util.*
// DOCSTART CustomVaultQuery // DOCSTART CustomVaultQuery

2
docs/source/example-code/src/main/kotlin/net/corda/docs/FlowCookbook.kt
View File

@ -3,7 +3,6 @@
package net.corda.docs package net.corda.docs
import co.paralleluniverse.fibers.Suspendable import co.paralleluniverse.fibers.Suspendable
import net.corda.contracts.asset.Cash
import net.corda.core.contracts.* import net.corda.core.contracts.*
import net.corda.core.crypto.SecureHash import net.corda.core.crypto.SecureHash
import net.corda.core.crypto.TransactionSignature import net.corda.core.crypto.TransactionSignature
@ -23,6 +22,7 @@ import net.corda.core.utilities.ProgressTracker.Step
import net.corda.core.utilities.UntrustworthyData import net.corda.core.utilities.UntrustworthyData
import net.corda.core.utilities.seconds import net.corda.core.utilities.seconds
import net.corda.core.utilities.unwrap import net.corda.core.utilities.unwrap
import net.corda.finance.contracts.asset.Cash
import net.corda.testing.ALICE_PUBKEY import net.corda.testing.ALICE_PUBKEY
import net.corda.testing.contracts.DummyContract import net.corda.testing.contracts.DummyContract
import net.corda.testing.contracts.DummyState import net.corda.testing.contracts.DummyState

7
docs/source/example-code/src/main/kotlin/net/corda/docs/FxTransactionBuildTutorial.kt
View File

@ -1,16 +1,12 @@
package net.corda.docs package net.corda.docs
import co.paralleluniverse.fibers.Suspendable import co.paralleluniverse.fibers.Suspendable
import net.corda.contracts.asset.Cash
import net.corda.core.contracts.Amount import net.corda.core.contracts.Amount
import net.corda.core.contracts.Issued import net.corda.core.contracts.Issued
import net.corda.core.contracts.StateAndRef import net.corda.core.contracts.StateAndRef
import net.corda.core.contracts.withoutIssuer import net.corda.core.contracts.withoutIssuer
import net.corda.core.crypto.SecureHash import net.corda.core.crypto.SecureHash
import net.corda.core.crypto.TransactionSignature import net.corda.core.crypto.TransactionSignature
import net.corda.core.flows.FlowLogic
import net.corda.core.flows.InitiatedBy
import net.corda.core.flows.InitiatingFlow
import net.corda.core.flows.* import net.corda.core.flows.*
import net.corda.core.identity.AbstractParty import net.corda.core.identity.AbstractParty
import net.corda.core.identity.Party import net.corda.core.identity.Party
@ -21,7 +17,8 @@ import net.corda.core.serialization.CordaSerializable
import net.corda.core.transactions.SignedTransaction import net.corda.core.transactions.SignedTransaction
import net.corda.core.transactions.TransactionBuilder import net.corda.core.transactions.TransactionBuilder
import net.corda.core.utilities.unwrap import net.corda.core.utilities.unwrap
import net.corda.schemas.CashSchemaV1 import net.corda.finance.contracts.asset.Cash
import net.corda.finance.schemas.CashSchemaV1
import java.util.* import java.util.*
@CordaSerializable @CordaSerializable

6
docs/source/example-code/src/test/kotlin/net/corda/docs/CustomVaultQueryTest.kt
View File

@ -1,12 +1,12 @@
package net.corda.docs package net.corda.docs
import net.corda.contracts.getCashBalances import net.corda.core.contracts.Amount
import net.corda.core.contracts.*
import net.corda.core.node.services.ServiceInfo import net.corda.core.node.services.ServiceInfo
import net.corda.core.utilities.OpaqueBytes import net.corda.core.utilities.OpaqueBytes
import net.corda.core.utilities.getOrThrow import net.corda.core.utilities.getOrThrow
import net.corda.finance.* import net.corda.finance.*
import net.corda.flows.CashIssueFlow import net.corda.finance.contracts.getCashBalances
import net.corda.finance.flows.CashIssueFlow
import net.corda.node.services.network.NetworkMapService import net.corda.node.services.network.NetworkMapService
import net.corda.node.services.transactions.ValidatingNotaryService import net.corda.node.services.transactions.ValidatingNotaryService
import net.corda.testing.DUMMY_NOTARY import net.corda.testing.DUMMY_NOTARY

4
docs/source/example-code/src/test/kotlin/net/corda/docs/FxTransactionBuildTutorialTest.kt
View File

@ -1,12 +1,12 @@
package net.corda.docs package net.corda.docs
import net.corda.contracts.getCashBalances
import net.corda.core.node.services.ServiceInfo import net.corda.core.node.services.ServiceInfo
import net.corda.core.toFuture import net.corda.core.toFuture
import net.corda.core.utilities.OpaqueBytes import net.corda.core.utilities.OpaqueBytes
import net.corda.core.utilities.getOrThrow import net.corda.core.utilities.getOrThrow
import net.corda.finance.* import net.corda.finance.*
import net.corda.flows.CashIssueFlow import net.corda.finance.contracts.getCashBalances
import net.corda.finance.flows.CashIssueFlow
import net.corda.node.services.network.NetworkMapService import net.corda.node.services.network.NetworkMapService
import net.corda.node.services.transactions.ValidatingNotaryService import net.corda.node.services.transactions.ValidatingNotaryService
import net.corda.testing.DUMMY_NOTARY import net.corda.testing.DUMMY_NOTARY

12
docs/source/flow-state-machines.rst
View File

@ -94,7 +94,7 @@ Our flow has two parties (B and S for buyer and seller) and will proceed as foll
recording the transaction in B's local vault, and then sending it on to S who also checks it and commits recording the transaction in B's local vault, and then sending it on to S who also checks it and commits
the transaction to S's local vault. the transaction to S's local vault.
You can find the implementation of this flow in the file ``finance/src/main/kotlin/net/corda/flows/TwoPartyTradeFlow.kt``. You can find the implementation of this flow in the file ``finance/src/main/kotlin/net/corda/finance/TwoPartyTradeFlow.kt``.
Assuming no malicious termination, they both end the flow being in possession of a valid, signed transaction that Assuming no malicious termination, they both end the flow being in possession of a valid, signed transaction that
represents an atomic asset swap. represents an atomic asset swap.
@ -235,7 +235,7 @@ Let's implement the ``Seller.call`` method. This will be run when the flow is in
.. container:: codeset .. container:: codeset
.. literalinclude:: ../../finance/src/main/kotlin/net/corda/flows/TwoPartyTradeFlow.kt .. literalinclude:: ../../finance/src/main/kotlin/net/corda/finance/flows/TwoPartyTradeFlow.kt
:language: kotlin :language: kotlin
:start-after: DOCSTART 4 :start-after: DOCSTART 4
:end-before: DOCEND 4 :end-before: DOCEND 4
@ -269,7 +269,7 @@ OK, let's do the same for the buyer side:
.. container:: codeset .. container:: codeset
.. literalinclude:: ../../finance/src/main/kotlin/net/corda/flows/TwoPartyTradeFlow.kt .. literalinclude:: ../../finance/src/main/kotlin/net/corda/finance/flows/TwoPartyTradeFlow.kt
:language: kotlin :language: kotlin
:start-after: DOCSTART 1 :start-after: DOCSTART 1
:end-before: DOCEND 1 :end-before: DOCEND 1
@ -428,7 +428,7 @@ override ``checkTransaction()`` to add our own custom validation logic:
.. container:: codeset .. container:: codeset
.. literalinclude:: ../../finance/src/main/kotlin/net/corda/flows/TwoPartyTradeFlow.kt .. literalinclude:: ../../finance/src/main/kotlin/net/corda/finance/flows/TwoPartyTradeFlow.kt
:language: kotlin :language: kotlin
:start-after: DOCSTART 5 :start-after: DOCSTART 5
:end-before: DOCEND 5 :end-before: DOCEND 5
@ -504,7 +504,7 @@ A flow might declare some steps with code inside the flow class like this:
.. container:: codeset .. container:: codeset
.. literalinclude:: ../../finance/src/main/kotlin/net/corda/flows/TwoPartyTradeFlow.kt .. literalinclude:: ../../finance/src/main/kotlin/net/corda/finance/flows/TwoPartyTradeFlow.kt
:language: kotlin :language: kotlin
:start-after: DOCSTART 2 :start-after: DOCSTART 2
:end-before: DOCEND 2 :end-before: DOCEND 2
@ -545,7 +545,7 @@ steps by overriding the ``Step`` class like this:
.. container:: codeset .. container:: codeset
.. literalinclude:: ../../finance/src/main/kotlin/net/corda/flows/TwoPartyTradeFlow.kt .. literalinclude:: ../../finance/src/main/kotlin/net/corda/finance/flows/TwoPartyTradeFlow.kt
:language: kotlin :language: kotlin
:start-after: DOCSTART 3 :start-after: DOCSTART 3
:end-before: DOCEND 3 :end-before: DOCEND 3

4
docs/source/tutorial-clientrpc-api.rst
View File

@ -132,7 +132,7 @@ When starting a standalone node using a configuration file we must supply the RP
.. code-block:: text .. code-block:: text
rpcUsers : [ rpcUsers : [
{ username=user, password=password, permissions=[ StartFlow.net.corda.flows.CashFlow ] } { username=user, password=password, permissions=[ StartFlow.net.corda.finance.flows.CashFlow ] }
] ]
When using the gradle Cordformation plugin to configure and deploy a node you must supply the RPC credentials in a similar When using the gradle Cordformation plugin to configure and deploy a node you must supply the RPC credentials in a similar
@ -143,7 +143,7 @@ manner:
rpcUsers = [ rpcUsers = [
['username' : "user", ['username' : "user",
'password' : "password", 'password' : "password",
'permissions' : ["StartFlow.net.corda.flows.CashFlow"]] 'permissions' : ["StartFlow.net.corda.finance.flows.CashFlow"]]
] ]
You can then deploy and launch the nodes (Notary and Alice) as follows: You can then deploy and launch the nodes (Notary and Alice) as follows:

8
docs/source/tutorial-cordapp.rst
View File

@ -407,10 +407,10 @@ list:
.. sourcecode:: none .. sourcecode:: none
com.example.flow.ExampleFlow$Initiator com.example.flow.ExampleFlow$Initiator
net.corda.flows.CashExitFlow net.corda.finance.flows.CashExitFlow
net.corda.flows.CashIssueFlow net.corda.finance.flows.CashIssueFlow
net.corda.flows.CashPaymentFlow net.corda.finance.flows.CashPaymentFlow
net.corda.flows.ContractUpgradeFlow net.corda.finance.flows.ContractUpgradeFlow
We can create a new IOU using the ``ExampleFlow$Initiator`` flow. For example, from the interactive shell of NodeA, you We can create a new IOU using the ``ExampleFlow$Initiator`` flow. For example, from the interactive shell of NodeA, you
can agree an IOU of 50 with NodeB by running ``flow start Initiator iouValue: 50, otherParty: NodeB``. can agree an IOU of 50 with NodeB by running ``flow start Initiator iouValue: 50, otherParty: NodeB``.

4
experimental/src/main/kotlin/net/corda/contracts/universal/Arrangement.kt → experimental/src/main/kotlin/net/corda/finance/contracts/universal/Arrangement.kt
View File

@ -1,8 +1,8 @@
package net.corda.contracts.universal package net.corda.finance.contracts.universal
import net.corda.contracts.Frequency
import net.corda.core.identity.Party import net.corda.core.identity.Party
import net.corda.core.serialization.CordaSerializable import net.corda.core.serialization.CordaSerializable
import net.corda.finance.contracts.Frequency
import java.math.BigDecimal import java.math.BigDecimal
import java.time.LocalDate import java.time.LocalDate
import java.util.* import java.util.*

2
experimental/src/main/kotlin/net/corda/contracts/universal/ContractFunctions.kt → experimental/src/main/kotlin/net/corda/finance/contracts/universal/ContractFunctions.kt
View File

@ -1,4 +1,4 @@
package net.corda.contracts.universal package net.corda.finance.contracts.universal
import net.corda.core.identity.Party import net.corda.core.identity.Party
import java.math.BigDecimal import java.math.BigDecimal

6
experimental/src/main/kotlin/net/corda/contracts/universal/Literal.kt → experimental/src/main/kotlin/net/corda/finance/contracts/universal/Literal.kt
View File

@ -1,8 +1,8 @@
package net.corda.contracts.universal package net.corda.finance.contracts.universal
import net.corda.contracts.BusinessCalendar
import net.corda.contracts.Frequency
import net.corda.core.identity.Party import net.corda.core.identity.Party
import net.corda.finance.contracts.BusinessCalendar
import net.corda.finance.contracts.Frequency
import java.math.BigDecimal import java.math.BigDecimal
import java.time.LocalDate import java.time.LocalDate
import java.util.* import java.util.*

6
experimental/src/main/kotlin/net/corda/contracts/universal/Perceivable.kt → experimental/src/main/kotlin/net/corda/finance/contracts/universal/Perceivable.kt
View File

@ -1,9 +1,9 @@
package net.corda.contracts.universal package net.corda.finance.contracts.universal
import net.corda.contracts.BusinessCalendar
import net.corda.contracts.Tenor
import net.corda.core.identity.Party import net.corda.core.identity.Party
import net.corda.core.serialization.CordaSerializable import net.corda.core.serialization.CordaSerializable
import net.corda.finance.contracts.BusinessCalendar
import net.corda.finance.contracts.Tenor
import java.lang.reflect.Type import java.lang.reflect.Type
import java.math.BigDecimal import java.math.BigDecimal
import java.security.PublicKey import java.security.PublicKey

2
experimental/src/main/kotlin/net/corda/contracts/universal/PrettyPrint.kt → experimental/src/main/kotlin/net/corda/finance/contracts/universal/PrettyPrint.kt
View File

@ -1,4 +1,4 @@
package net.corda.contracts.universal package net.corda.finance.contracts.universal
import net.corda.core.crypto.commonName import net.corda.core.crypto.commonName
import net.corda.core.crypto.toStringShort import net.corda.core.crypto.toStringShort

0
experimental/src/main/kotlin/net/corda/contracts/universal/README.md → experimental/src/main/kotlin/net/corda/finance/contracts/universal/README.md
View File

8
experimental/src/main/kotlin/net/corda/contracts/universal/UniversalContract.kt → experimental/src/main/kotlin/net/corda/finance/contracts/universal/UniversalContract.kt
View File

@ -1,12 +1,12 @@
package net.corda.contracts.universal package net.corda.finance.contracts.universal
import net.corda.contracts.BusinessCalendar
import net.corda.contracts.FixOf
import net.corda.core.contracts.* import net.corda.core.contracts.*
import net.corda.core.identity.AbstractParty import net.corda.core.identity.AbstractParty
import net.corda.core.identity.Party import net.corda.core.identity.Party
import net.corda.core.transactions.LedgerTransaction import net.corda.core.transactions.LedgerTransaction
import net.corda.core.transactions.TransactionBuilder import net.corda.core.transactions.TransactionBuilder
import net.corda.finance.contracts.BusinessCalendar
import net.corda.finance.contracts.FixOf
import java.math.BigDecimal import java.math.BigDecimal
import java.time.Instant import java.time.Instant
@ -20,7 +20,7 @@ class UniversalContract : Contract {
interface Commands : CommandData { interface Commands : CommandData {
data class Fix(val fixes: List<net.corda.contracts.Fix>) : Commands data class Fix(val fixes: List<net.corda.finance.contracts.Fix>) : Commands
// transition according to business rules defined in contract // transition according to business rules defined in contract
data class Action(val name: String) : Commands data class Action(val name: String) : Commands

4
experimental/src/main/kotlin/net/corda/contracts/universal/Util.kt → experimental/src/main/kotlin/net/corda/finance/contracts/universal/Util.kt
View File

@ -1,9 +1,9 @@
package net.corda.contracts.universal package net.corda.finance.contracts.universal
import com.google.common.collect.ImmutableSet import com.google.common.collect.ImmutableSet
import com.google.common.collect.Sets import com.google.common.collect.Sets
import net.corda.contracts.Frequency
import net.corda.core.identity.Party import net.corda.core.identity.Party
import net.corda.finance.contracts.Frequency
import java.security.PublicKey import java.security.PublicKey
import java.time.Instant import java.time.Instant
import java.time.LocalDate import java.time.LocalDate

30
experimental/src/test/kotlin/net/corda/contracts/universal/Cap.kt → experimental/src/test/kotlin/net/corda/finance/contracts/universal/Cap.kt
View File

@ -1,9 +1,9 @@
package net.corda.contracts.universal package net.corda.finance.contracts.universal
import net.corda.contracts.BusinessCalendar import net.corda.finance.contracts.BusinessCalendar
import net.corda.contracts.FixOf import net.corda.finance.contracts.FixOf
import net.corda.contracts.Frequency import net.corda.finance.contracts.Frequency
import net.corda.contracts.Tenor import net.corda.finance.contracts.Tenor
import net.corda.testing.DUMMY_NOTARY import net.corda.testing.DUMMY_NOTARY
import net.corda.testing.transaction import net.corda.testing.transaction
import org.junit.Ignore import org.junit.Ignore
@ -196,32 +196,32 @@ class Cap {
tweak { tweak {
// wrong source // wrong source
command(highStreetBank.owningKey) { UniversalContract.Commands.Fix(listOf(net.corda.contracts.Fix(FixOf("LIBORx", tradeDate, Tenor("3M")), 1.0.bd))) } command(highStreetBank.owningKey) { UniversalContract.Commands.Fix(listOf(net.corda.finance.contracts.Fix(FixOf("LIBORx", tradeDate, Tenor("3M")), 1.0.bd))) }
this `fails with` "relevant fixing must be included" this `fails with` "relevant fixing must be included"
} }
tweak { tweak {
// wrong date // wrong date
command(highStreetBank.owningKey) { UniversalContract.Commands.Fix(listOf(net.corda.contracts.Fix(FixOf("LIBOR", tradeDate.plusYears(1), Tenor("3M")), 1.0.bd))) } command(highStreetBank.owningKey) { UniversalContract.Commands.Fix(listOf(net.corda.finance.contracts.Fix(FixOf("LIBOR", tradeDate.plusYears(1), Tenor("3M")), 1.0.bd))) }
this `fails with` "relevant fixing must be included" this `fails with` "relevant fixing must be included"
} }
tweak { tweak {
// wrong tenor // wrong tenor
command(highStreetBank.owningKey) { UniversalContract.Commands.Fix(listOf(net.corda.contracts.Fix(FixOf("LIBOR", tradeDate, Tenor("9M")), 1.0.bd))) } command(highStreetBank.owningKey) { UniversalContract.Commands.Fix(listOf(net.corda.finance.contracts.Fix(FixOf("LIBOR", tradeDate, Tenor("9M")), 1.0.bd))) }
this `fails with` "relevant fixing must be included" this `fails with` "relevant fixing must be included"
} }
tweak { tweak {
command(highStreetBank.owningKey) { UniversalContract.Commands.Fix(listOf(net.corda.contracts.Fix(FixOf("LIBOR", tradeDate, Tenor("3M")), 1.5.bd))) } command(highStreetBank.owningKey) { UniversalContract.Commands.Fix(listOf(net.corda.finance.contracts.Fix(FixOf("LIBOR", tradeDate, Tenor("3M")), 1.5.bd))) }
this `fails with` "output state does not reflect fix command" this `fails with` "output state does not reflect fix command"
} }
command(highStreetBank.owningKey) { UniversalContract.Commands.Fix(listOf(net.corda.contracts.Fix(FixOf("LIBOR", tradeDate, Tenor("3M")), 1.0.bd))) } command(highStreetBank.owningKey) { UniversalContract.Commands.Fix(listOf(net.corda.finance.contracts.Fix(FixOf("LIBOR", tradeDate, Tenor("3M")), 1.0.bd))) }
this.verifies() this.verifies()
} }
@ -280,32 +280,32 @@ class Cap {
tweak { tweak {
// wrong source // wrong source
command(highStreetBank.owningKey) { UniversalContract.Commands.Fix(listOf(net.corda.contracts.Fix(FixOf("LIBORx", BusinessCalendar.parseDateFromString("2017-03-01"), Tenor("3M")), 1.0.bd))) } command(highStreetBank.owningKey) { UniversalContract.Commands.Fix(listOf(net.corda.finance.contracts.Fix(FixOf("LIBORx", BusinessCalendar.parseDateFromString("2017-03-01"), Tenor("3M")), 1.0.bd))) }
this `fails with` "relevant fixing must be included" this `fails with` "relevant fixing must be included"
} }
tweak { tweak {
// wrong date // wrong date
command(highStreetBank.owningKey) { UniversalContract.Commands.Fix(listOf(net.corda.contracts.Fix(FixOf("LIBOR", BusinessCalendar.parseDateFromString("2017-03-01").plusYears(1), Tenor("3M")), 1.0.bd))) } command(highStreetBank.owningKey) { UniversalContract.Commands.Fix(listOf(net.corda.finance.contracts.Fix(FixOf("LIBOR", BusinessCalendar.parseDateFromString("2017-03-01").plusYears(1), Tenor("3M")), 1.0.bd))) }
this `fails with` "relevant fixing must be included" this `fails with` "relevant fixing must be included"
} }
tweak { tweak {
// wrong tenor // wrong tenor
command(highStreetBank.owningKey) { UniversalContract.Commands.Fix(listOf(net.corda.contracts.Fix(FixOf("LIBOR", BusinessCalendar.parseDateFromString("2017-03-01"), Tenor("9M")), 1.0.bd))) } command(highStreetBank.owningKey) { UniversalContract.Commands.Fix(listOf(net.corda.finance.contracts.Fix(FixOf("LIBOR", BusinessCalendar.parseDateFromString("2017-03-01"), Tenor("9M")), 1.0.bd))) }
this `fails with` "relevant fixing must be included" this `fails with` "relevant fixing must be included"
} }
tweak { tweak {
command(highStreetBank.owningKey) { UniversalContract.Commands.Fix(listOf(net.corda.contracts.Fix(FixOf("LIBOR", BusinessCalendar.parseDateFromString("2017-03-01"), Tenor("3M")), 1.5.bd))) } command(highStreetBank.owningKey) { UniversalContract.Commands.Fix(listOf(net.corda.finance.contracts.Fix(FixOf("LIBOR", BusinessCalendar.parseDateFromString("2017-03-01"), Tenor("3M")), 1.5.bd))) }
this `fails with` "output state does not reflect fix command" this `fails with` "output state does not reflect fix command"
} }
command(highStreetBank.owningKey) { UniversalContract.Commands.Fix(listOf(net.corda.contracts.Fix(FixOf("LIBOR", BusinessCalendar.parseDateFromString("2017-03-01"), Tenor("3M")), 1.0.bd))) } command(highStreetBank.owningKey) { UniversalContract.Commands.Fix(listOf(net.corda.finance.contracts.Fix(FixOf("LIBOR", BusinessCalendar.parseDateFromString("2017-03-01"), Tenor("3M")), 1.0.bd))) }
this.verifies() this.verifies()
} }

16
experimental/src/test/kotlin/net/corda/contracts/universal/Caplet.kt → experimental/src/test/kotlin/net/corda/finance/contracts/universal/Caplet.kt
View File

@ -1,7 +1,7 @@
package net.corda.contracts.universal package net.corda.finance.contracts.universal
import net.corda.contracts.FixOf import net.corda.finance.contracts.FixOf
import net.corda.contracts.Tenor import net.corda.finance.contracts.Tenor
import net.corda.testing.DUMMY_NOTARY import net.corda.testing.DUMMY_NOTARY
import net.corda.testing.transaction import net.corda.testing.transaction
import org.junit.Ignore import org.junit.Ignore
@ -101,32 +101,32 @@ class Caplet {
tweak { tweak {
// wrong source // wrong source
command(highStreetBank.owningKey) { UniversalContract.Commands.Fix(listOf(net.corda.contracts.Fix(FixOf("LIBORx", tradeDate, Tenor("6M")), 1.0.bd))) } command(highStreetBank.owningKey) { UniversalContract.Commands.Fix(listOf(net.corda.finance.contracts.Fix(FixOf("LIBORx", tradeDate, Tenor("6M")), 1.0.bd))) }
this `fails with` "relevant fixing must be included" this `fails with` "relevant fixing must be included"
} }
tweak { tweak {
// wrong date // wrong date
command(highStreetBank.owningKey) { UniversalContract.Commands.Fix(listOf(net.corda.contracts.Fix(FixOf("LIBOR", tradeDate.plusYears(1), Tenor("6M")), 1.0.bd))) } command(highStreetBank.owningKey) { UniversalContract.Commands.Fix(listOf(net.corda.finance.contracts.Fix(FixOf("LIBOR", tradeDate.plusYears(1), Tenor("6M")), 1.0.bd))) }
this `fails with` "relevant fixing must be included" this `fails with` "relevant fixing must be included"
} }
tweak { tweak {
// wrong tenor // wrong tenor
command(highStreetBank.owningKey) { UniversalContract.Commands.Fix(listOf(net.corda.contracts.Fix(FixOf("LIBOR", tradeDate, Tenor("3M")), 1.0.bd))) } command(highStreetBank.owningKey) { UniversalContract.Commands.Fix(listOf(net.corda.finance.contracts.Fix(FixOf("LIBOR", tradeDate, Tenor("3M")), 1.0.bd))) }
this `fails with` "relevant fixing must be included" this `fails with` "relevant fixing must be included"
} }
tweak { tweak {
command(highStreetBank.owningKey) { UniversalContract.Commands.Fix(listOf(net.corda.contracts.Fix(FixOf("LIBOR", tradeDate, Tenor("6M")), 1.5.bd))) } command(highStreetBank.owningKey) { UniversalContract.Commands.Fix(listOf(net.corda.finance.contracts.Fix(FixOf("LIBOR", tradeDate, Tenor("6M")), 1.5.bd))) }
this `fails with` "output state does not reflect fix command" this `fails with` "output state does not reflect fix command"
} }
command(highStreetBank.owningKey) { UniversalContract.Commands.Fix(listOf(net.corda.contracts.Fix(FixOf("LIBOR", tradeDate, Tenor("6M")), 1.0.bd))) } command(highStreetBank.owningKey) { UniversalContract.Commands.Fix(listOf(net.corda.finance.contracts.Fix(FixOf("LIBOR", tradeDate, Tenor("6M")), 1.0.bd))) }
this.verifies() this.verifies()
} }

2
experimental/src/test/kotlin/net/corda/contracts/universal/ContractDefinition.kt → experimental/src/test/kotlin/net/corda/finance/contracts/universal/ContractDefinition.kt
View File

@ -1,4 +1,4 @@
package net.corda.contracts.universal package net.corda.finance.contracts.universal
import net.corda.core.crypto.generateKeyPair import net.corda.core.crypto.generateKeyPair
import net.corda.core.identity.Party import net.corda.core.identity.Party

2
experimental/src/test/kotlin/net/corda/contracts/universal/Examples.kt → experimental/src/test/kotlin/net/corda/finance/contracts/universal/Examples.kt
View File

@ -1,4 +1,4 @@
package net.corda.contracts.universal package net.corda.finance.contracts.universal
import net.corda.finance.USD import net.corda.finance.USD
import org.junit.Ignore import org.junit.Ignore

2
experimental/src/test/kotlin/net/corda/contracts/universal/FXFwdTimeOption.kt → experimental/src/test/kotlin/net/corda/finance/contracts/universal/FXFwdTimeOption.kt
View File

@ -1,4 +1,4 @@
package net.corda.contracts.universal package net.corda.finance.contracts.universal
import net.corda.testing.DUMMY_NOTARY import net.corda.testing.DUMMY_NOTARY
import net.corda.testing.transaction import net.corda.testing.transaction

2
experimental/src/test/kotlin/net/corda/contracts/universal/FXSwap.kt → experimental/src/test/kotlin/net/corda/finance/contracts/universal/FXSwap.kt
View File

@ -1,4 +1,4 @@
package net.corda.contracts.universal package net.corda.finance.contracts.universal
import net.corda.testing.DUMMY_NOTARY import net.corda.testing.DUMMY_NOTARY
import net.corda.testing.transaction import net.corda.testing.transaction

18
experimental/src/test/kotlin/net/corda/contracts/universal/IRS.kt → experimental/src/test/kotlin/net/corda/finance/contracts/universal/IRS.kt
View File

@ -1,8 +1,8 @@
package net.corda.contracts.universal package net.corda.finance.contracts.universal
import net.corda.contracts.FixOf import net.corda.finance.contracts.FixOf
import net.corda.contracts.Frequency import net.corda.finance.contracts.Frequency
import net.corda.contracts.Tenor import net.corda.finance.contracts.Tenor
import net.corda.testing.DUMMY_NOTARY import net.corda.testing.DUMMY_NOTARY
import net.corda.testing.transaction import net.corda.testing.transaction
import org.junit.Ignore import org.junit.Ignore
@ -163,32 +163,32 @@ class IRS {
tweak { tweak {
// wrong source // wrong source
command(highStreetBank.owningKey) { UniversalContract.Commands.Fix(listOf(net.corda.contracts.Fix(FixOf("LIBORx", tradeDate, Tenor("3M")), 1.0.bd))) } command(highStreetBank.owningKey) { UniversalContract.Commands.Fix(listOf(net.corda.finance.contracts.Fix(FixOf("LIBORx", tradeDate, Tenor("3M")), 1.0.bd))) }
this `fails with` "relevant fixing must be included" this `fails with` "relevant fixing must be included"
} }
tweak { tweak {
// wrong date // wrong date
command(highStreetBank.owningKey) { UniversalContract.Commands.Fix(listOf(net.corda.contracts.Fix(FixOf("LIBOR", tradeDate.plusYears(1), Tenor("3M")), 1.0.bd))) } command(highStreetBank.owningKey) { UniversalContract.Commands.Fix(listOf(net.corda.finance.contracts.Fix(FixOf("LIBOR", tradeDate.plusYears(1), Tenor("3M")), 1.0.bd))) }
this `fails with` "relevant fixing must be included" this `fails with` "relevant fixing must be included"
} }
tweak { tweak {
// wrong tenor // wrong tenor
command(highStreetBank.owningKey) { UniversalContract.Commands.Fix(listOf(net.corda.contracts.Fix(FixOf("LIBOR", tradeDate, Tenor("9M")), 1.0.bd))) } command(highStreetBank.owningKey) { UniversalContract.Commands.Fix(listOf(net.corda.finance.contracts.Fix(FixOf("LIBOR", tradeDate, Tenor("9M")), 1.0.bd))) }
this `fails with` "relevant fixing must be included" this `fails with` "relevant fixing must be included"
} }
tweak { tweak {
command(highStreetBank.owningKey) { UniversalContract.Commands.Fix(listOf(net.corda.contracts.Fix(FixOf("LIBOR", tradeDate, Tenor("3M")), 1.5.bd))) } command(highStreetBank.owningKey) { UniversalContract.Commands.Fix(listOf(net.corda.finance.contracts.Fix(FixOf("LIBOR", tradeDate, Tenor("3M")), 1.5.bd))) }
this `fails with` "output state does not reflect fix command" this `fails with` "output state does not reflect fix command"
} }
command(highStreetBank.owningKey) { UniversalContract.Commands.Fix(listOf(net.corda.contracts.Fix(FixOf("LIBOR", tradeDate, Tenor("3M")), 1.0.bd))) } command(highStreetBank.owningKey) { UniversalContract.Commands.Fix(listOf(net.corda.finance.contracts.Fix(FixOf("LIBOR", tradeDate, Tenor("3M")), 1.0.bd))) }
this.verifies() this.verifies()
} }

4
experimental/src/test/kotlin/net/corda/contracts/universal/RollOutTests.kt → experimental/src/test/kotlin/net/corda/finance/contracts/universal/RollOutTests.kt
View File

@ -1,6 +1,6 @@
package net.corda.contracts.universal package net.corda.finance.contracts.universal
import net.corda.contracts.Frequency import net.corda.finance.contracts.Frequency
import net.corda.testing.DUMMY_NOTARY import net.corda.testing.DUMMY_NOTARY
import net.corda.testing.transaction import net.corda.testing.transaction
import org.junit.Test import org.junit.Test

6
experimental/src/test/kotlin/net/corda/contracts/universal/Swaption.kt → experimental/src/test/kotlin/net/corda/finance/contracts/universal/Swaption.kt
View File

@ -1,7 +1,7 @@
package net.corda.contracts.universal package net.corda.finance.contracts.universal
import net.corda.contracts.Frequency import net.corda.finance.contracts.Frequency
import net.corda.contracts.Tenor import net.corda.finance.contracts.Tenor
import net.corda.testing.DUMMY_NOTARY import net.corda.testing.DUMMY_NOTARY
import net.corda.testing.transaction import net.corda.testing.transaction
import org.junit.Ignore import org.junit.Ignore

2
experimental/src/test/kotlin/net/corda/contracts/universal/ZeroCouponBond.kt → experimental/src/test/kotlin/net/corda/finance/contracts/universal/ZeroCouponBond.kt
View File

@ -1,4 +1,4 @@
package net.corda.contracts.universal package net.corda.finance.contracts.universal
import net.corda.testing.DUMMY_NOTARY import net.corda.testing.DUMMY_NOTARY
import net.corda.testing.transaction import net.corda.testing.transaction

2
finance/isolated/src/main/kotlin/net/corda/contracts/isolated/AnotherDummyContract.kt → finance/isolated/src/main/kotlin/net/corda/finance/contracts/isolated/AnotherDummyContract.kt
View File

@ -1,4 +1,4 @@
package net.corda.contracts.isolated package net.corda.finance.contracts.isolated
import net.corda.core.contracts.* import net.corda.core.contracts.*
import net.corda.core.identity.AbstractParty import net.corda.core.identity.AbstractParty

11
finance/src/main/java/net/corda/contracts/ICommercialPaperState.java → finance/src/main/java/net/corda/finance/contracts/ICommercialPaperState.java
View File

@ -1,11 +1,12 @@
package net.corda.contracts; package net.corda.finance.contracts;
import net.corda.core.contracts.*; import net.corda.core.contracts.Amount;
import net.corda.core.contracts.ContractState;
import net.corda.core.contracts.Issued;
import net.corda.core.identity.AbstractParty; import net.corda.core.identity.AbstractParty;
import java.security.PublicKey; import java.time.Instant;
import java.time.*; import java.util.Currency;
import java.util.*;
/* This is an interface solely created to demonstrate that the same kotlin tests can be run against /* This is an interface solely created to demonstrate that the same kotlin tests can be run against
* either a Java implementation of the CommercialPaper or a kotlin implementation. * either a Java implementation of the CommercialPaper or a kotlin implementation.

10
finance/src/main/java/net/corda/contracts/JavaCommercialPaper.java → finance/src/main/java/net/corda/finance/contracts/JavaCommercialPaper.java
View File

@ -1,10 +1,9 @@
package net.corda.contracts; package net.corda.finance.contracts;
import co.paralleluniverse.fibers.Suspendable; import co.paralleluniverse.fibers.Suspendable;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables; import com.google.common.collect.Iterables;
import kotlin.Unit; import kotlin.Unit;
import net.corda.contracts.asset.Cash;
import net.corda.core.contracts.*; import net.corda.core.contracts.*;
import net.corda.core.crypto.testing.NullPublicKey; import net.corda.core.crypto.testing.NullPublicKey;
import net.corda.core.identity.AbstractParty; import net.corda.core.identity.AbstractParty;
@ -13,12 +12,15 @@ import net.corda.core.identity.Party;
import net.corda.core.node.ServiceHub; import net.corda.core.node.ServiceHub;
import net.corda.core.transactions.LedgerTransaction; import net.corda.core.transactions.LedgerTransaction;
import net.corda.core.transactions.TransactionBuilder; import net.corda.core.transactions.TransactionBuilder;
import net.corda.finance.utils.*; import net.corda.finance.contracts.asset.Cash;
import net.corda.finance.utils.StateSumming;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import java.time.Instant; import java.time.Instant;
import java.util.*; import java.util.Collections;
import java.util.Currency;
import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static net.corda.core.contracts.ContractsDSL.requireSingleCommand; import static net.corda.core.contracts.ContractsDSL.requireSingleCommand;

6
finance/src/main/kotlin/net/corda/contracts/CommercialPaper.kt → finance/src/main/kotlin/net/corda/finance/contracts/CommercialPaper.kt
View File

@ -1,7 +1,6 @@
package net.corda.contracts package net.corda.finance.contracts
import co.paralleluniverse.fibers.Suspendable import co.paralleluniverse.fibers.Suspendable
import net.corda.contracts.asset.Cash
import net.corda.core.contracts.* import net.corda.core.contracts.*
import net.corda.core.crypto.testing.NULL_PARTY import net.corda.core.crypto.testing.NULL_PARTY
import net.corda.core.crypto.toBase58String import net.corda.core.crypto.toBase58String
@ -14,8 +13,9 @@ import net.corda.core.schemas.PersistentState
import net.corda.core.schemas.QueryableState import net.corda.core.schemas.QueryableState
import net.corda.core.transactions.LedgerTransaction import net.corda.core.transactions.LedgerTransaction
import net.corda.core.transactions.TransactionBuilder import net.corda.core.transactions.TransactionBuilder
import net.corda.finance.contracts.asset.Cash
import net.corda.finance.schemas.CommercialPaperSchemaV1
import net.corda.finance.utils.sumCashBy import net.corda.finance.utils.sumCashBy
import net.corda.schemas.CommercialPaperSchemaV1
import java.time.Instant import java.time.Instant
import java.util.* import java.util.*

4
finance/src/main/kotlin/net/corda/contracts/FinanceTypes.kt → finance/src/main/kotlin/net/corda/finance/contracts/FinanceTypes.kt
View File

@ -1,4 +1,4 @@
package net.corda.contracts package net.corda.finance.contracts
import com.fasterxml.jackson.core.JsonGenerator import com.fasterxml.jackson.core.JsonGenerator
import com.fasterxml.jackson.core.JsonParser import com.fasterxml.jackson.core.JsonParser
@ -8,7 +8,6 @@ import com.fasterxml.jackson.databind.JsonSerializer
import com.fasterxml.jackson.databind.SerializerProvider import com.fasterxml.jackson.databind.SerializerProvider
import com.fasterxml.jackson.databind.annotation.JsonDeserialize import com.fasterxml.jackson.databind.annotation.JsonDeserialize
import com.fasterxml.jackson.databind.annotation.JsonSerialize import com.fasterxml.jackson.databind.annotation.JsonSerialize
import net.corda.contracts.asset.CommodityContract
import net.corda.core.contracts.CommandData import net.corda.core.contracts.CommandData
import net.corda.core.contracts.LinearState import net.corda.core.contracts.LinearState
import net.corda.core.contracts.StateAndRef import net.corda.core.contracts.StateAndRef
@ -17,6 +16,7 @@ import net.corda.core.identity.Party
import net.corda.core.node.services.ServiceType import net.corda.core.node.services.ServiceType
import net.corda.core.serialization.CordaSerializable import net.corda.core.serialization.CordaSerializable
import net.corda.core.transactions.TransactionBuilder import net.corda.core.transactions.TransactionBuilder
import net.corda.finance.contracts.asset.CommodityContract
import java.math.BigDecimal import java.math.BigDecimal
import java.time.DayOfWeek import java.time.DayOfWeek
import java.time.LocalDate import java.time.LocalDate

4
finance/src/main/kotlin/net/corda/contracts/GetBalances.kt → finance/src/main/kotlin/net/corda/finance/contracts/GetBalances.kt
View File

@ -1,6 +1,6 @@
@file:JvmName("GetBalances") @file:JvmName("GetBalances")
package net.corda.contracts package net.corda.finance.contracts
import net.corda.core.contracts.Amount import net.corda.core.contracts.Amount
import net.corda.core.contracts.FungibleAsset import net.corda.core.contracts.FungibleAsset
@ -12,7 +12,7 @@ import net.corda.core.node.services.queryBy
import net.corda.core.node.services.vault.QueryCriteria import net.corda.core.node.services.vault.QueryCriteria
import net.corda.core.node.services.vault.Sort import net.corda.core.node.services.vault.Sort
import net.corda.core.node.services.vault.builder import net.corda.core.node.services.vault.builder
import net.corda.schemas.CashSchemaV1 import net.corda.finance.schemas.CashSchemaV1
import java.util.* import java.util.*
import kotlin.collections.LinkedHashMap import kotlin.collections.LinkedHashMap

4
finance/src/main/kotlin/net/corda/contracts/asset/Cash.kt → finance/src/main/kotlin/net/corda/finance/contracts/asset/Cash.kt
View File

@ -1,5 +1,5 @@
@file:JvmName("CashUtilities") // So the static extension functions get put into a class with a better name than CashKt @file:JvmName("CashUtilities") // So the static extension functions get put into a class with a better name than CashKt
package net.corda.contracts.asset package net.corda.finance.contracts.asset
import co.paralleluniverse.fibers.Suspendable import co.paralleluniverse.fibers.Suspendable
import co.paralleluniverse.strands.Strand import co.paralleluniverse.strands.Strand
@ -24,10 +24,10 @@ import net.corda.core.utilities.OpaqueBytes
import net.corda.core.utilities.toHexString import net.corda.core.utilities.toHexString
import net.corda.core.utilities.toNonEmptySet import net.corda.core.utilities.toNonEmptySet
import net.corda.core.utilities.trace import net.corda.core.utilities.trace
import net.corda.finance.schemas.CashSchemaV1
import net.corda.finance.utils.sumCash import net.corda.finance.utils.sumCash
import net.corda.finance.utils.sumCashOrNull import net.corda.finance.utils.sumCashOrNull
import net.corda.finance.utils.sumCashOrZero import net.corda.finance.utils.sumCashOrZero
import net.corda.schemas.CashSchemaV1
import org.bouncycastle.asn1.x500.X500Name import org.bouncycastle.asn1.x500.X500Name
import java.math.BigInteger import java.math.BigInteger
import java.security.PublicKey import java.security.PublicKey

4
finance/src/main/kotlin/net/corda/contracts/asset/CommodityContract.kt → finance/src/main/kotlin/net/corda/finance/contracts/asset/CommodityContract.kt
View File

@ -1,12 +1,12 @@
package net.corda.contracts.asset package net.corda.finance.contracts.asset
import net.corda.contracts.Commodity
import net.corda.core.contracts.* import net.corda.core.contracts.*
import net.corda.core.identity.AbstractParty import net.corda.core.identity.AbstractParty
import net.corda.core.identity.Party import net.corda.core.identity.Party
import net.corda.core.serialization.CordaSerializable import net.corda.core.serialization.CordaSerializable
import net.corda.core.transactions.LedgerTransaction import net.corda.core.transactions.LedgerTransaction
import net.corda.core.transactions.TransactionBuilder import net.corda.core.transactions.TransactionBuilder
import net.corda.finance.contracts.Commodity
import net.corda.finance.utils.sumCommodities import net.corda.finance.utils.sumCommodities
import net.corda.finance.utils.sumCommoditiesOrNull import net.corda.finance.utils.sumCommoditiesOrNull
import net.corda.finance.utils.sumCommoditiesOrZero import net.corda.finance.utils.sumCommoditiesOrZero

10
finance/src/main/kotlin/net/corda/contracts/asset/Obligation.kt → finance/src/main/kotlin/net/corda/finance/contracts/asset/Obligation.kt
View File

@ -1,9 +1,9 @@
package net.corda.contracts.asset package net.corda.finance.contracts.asset
import net.corda.contracts.NetCommand import net.corda.finance.contracts.NetCommand
import net.corda.contracts.NetType import net.corda.finance.contracts.NetType
import net.corda.contracts.NettableState import net.corda.finance.contracts.NettableState
import net.corda.contracts.asset.Obligation.Lifecycle.NORMAL import net.corda.finance.contracts.asset.Obligation.Lifecycle.NORMAL
import net.corda.core.contracts.* import net.corda.core.contracts.*
import net.corda.core.crypto.SecureHash import net.corda.core.crypto.SecureHash
import net.corda.core.crypto.entropyToKeyPair import net.corda.core.crypto.entropyToKeyPair

2
finance/src/main/kotlin/net/corda/contracts/asset/OnLedgerAsset.kt → finance/src/main/kotlin/net/corda/finance/contracts/asset/OnLedgerAsset.kt
View File

@ -1,4 +1,4 @@
package net.corda.contracts.asset package net.corda.finance.contracts.asset
import net.corda.core.contracts.* import net.corda.core.contracts.*
import net.corda.core.contracts.Amount.Companion.sumOrThrow import net.corda.core.contracts.Amount.Companion.sumOrThrow

2
finance/src/main/kotlin/net/corda/contracts/math/Interpolators.kt → finance/src/main/kotlin/net/corda/finance/contracts/math/Interpolators.kt
View File

@ -1,4 +1,4 @@
package net.corda.contracts.math package net.corda.finance.contracts.math
import java.util.* import java.util.*

2
finance/src/main/kotlin/net/corda/flows/AbstractCashFlow.kt → finance/src/main/kotlin/net/corda/finance/flows/AbstractCashFlow.kt
View File

@ -1,4 +1,4 @@
package net.corda.flows package net.corda.finance.flows
import co.paralleluniverse.fibers.Suspendable import co.paralleluniverse.fibers.Suspendable
import net.corda.core.contracts.Amount import net.corda.core.contracts.Amount

6
finance/src/main/kotlin/net/corda/flows/CashExitFlow.kt → finance/src/main/kotlin/net/corda/finance/flows/CashExitFlow.kt
View File

@ -1,10 +1,8 @@
package net.corda.flows package net.corda.finance.flows
import co.paralleluniverse.fibers.Suspendable import co.paralleluniverse.fibers.Suspendable
import net.corda.contracts.asset.Cash
import net.corda.core.contracts.Amount import net.corda.core.contracts.Amount
import net.corda.core.contracts.InsufficientBalanceException import net.corda.core.contracts.InsufficientBalanceException
import net.corda.finance.issuedBy
import net.corda.core.flows.StartableByRPC import net.corda.core.flows.StartableByRPC
import net.corda.core.identity.Party import net.corda.core.identity.Party
import net.corda.core.node.services.queryBy import net.corda.core.node.services.queryBy
@ -15,6 +13,8 @@ import net.corda.core.serialization.CordaSerializable
import net.corda.core.transactions.TransactionBuilder import net.corda.core.transactions.TransactionBuilder
import net.corda.core.utilities.OpaqueBytes import net.corda.core.utilities.OpaqueBytes
import net.corda.core.utilities.ProgressTracker import net.corda.core.utilities.ProgressTracker
import net.corda.finance.contracts.asset.Cash
import net.corda.finance.issuedBy
import java.util.* import java.util.*
/** /**

2
finance/src/main/kotlin/net/corda/flows/CashFlowCommand.kt → finance/src/main/kotlin/net/corda/finance/flows/CashFlowCommand.kt
View File

@ -1,4 +1,4 @@
package net.corda.flows package net.corda.finance.flows
import net.corda.core.contracts.Amount import net.corda.core.contracts.Amount
import net.corda.core.identity.Party import net.corda.core.identity.Party

2
finance/src/main/kotlin/net/corda/flows/CashIssueAndPaymentFlow.kt → finance/src/main/kotlin/net/corda/finance/flows/CashIssueAndPaymentFlow.kt
View File

@ -1,4 +1,4 @@
package net.corda.flows package net.corda.finance.flows
import co.paralleluniverse.fibers.Suspendable import co.paralleluniverse.fibers.Suspendable
import net.corda.core.contracts.Amount import net.corda.core.contracts.Amount

6
finance/src/main/kotlin/net/corda/flows/CashIssueFlow.kt → finance/src/main/kotlin/net/corda/finance/flows/CashIssueFlow.kt
View File

@ -1,9 +1,7 @@
package net.corda.flows package net.corda.finance.flows
import co.paralleluniverse.fibers.Suspendable import co.paralleluniverse.fibers.Suspendable
import net.corda.contracts.asset.Cash
import net.corda.core.contracts.Amount import net.corda.core.contracts.Amount
import net.corda.finance.issuedBy
import net.corda.core.flows.FinalityFlow import net.corda.core.flows.FinalityFlow
import net.corda.core.flows.StartableByRPC import net.corda.core.flows.StartableByRPC
import net.corda.core.identity.Party import net.corda.core.identity.Party
@ -11,6 +9,8 @@ import net.corda.core.serialization.CordaSerializable
import net.corda.core.transactions.TransactionBuilder import net.corda.core.transactions.TransactionBuilder
import net.corda.core.utilities.OpaqueBytes import net.corda.core.utilities.OpaqueBytes
import net.corda.core.utilities.ProgressTracker import net.corda.core.utilities.ProgressTracker
import net.corda.finance.contracts.asset.Cash
import net.corda.finance.issuedBy
import java.util.* import java.util.*
/** /**

4
finance/src/main/kotlin/net/corda/flows/CashPaymentFlow.kt → finance/src/main/kotlin/net/corda/finance/flows/CashPaymentFlow.kt
View File

@ -1,7 +1,6 @@
package net.corda.flows package net.corda.finance.flows
import co.paralleluniverse.fibers.Suspendable import co.paralleluniverse.fibers.Suspendable
import net.corda.contracts.asset.Cash
import net.corda.core.contracts.Amount import net.corda.core.contracts.Amount
import net.corda.core.contracts.InsufficientBalanceException import net.corda.core.contracts.InsufficientBalanceException
import net.corda.core.flows.StartableByRPC import net.corda.core.flows.StartableByRPC
@ -11,6 +10,7 @@ import net.corda.core.identity.Party
import net.corda.core.serialization.CordaSerializable import net.corda.core.serialization.CordaSerializable
import net.corda.core.transactions.TransactionBuilder import net.corda.core.transactions.TransactionBuilder
import net.corda.core.utilities.ProgressTracker import net.corda.core.utilities.ProgressTracker
import net.corda.finance.contracts.asset.Cash
import java.util.* import java.util.*
/** /**

4
finance/src/main/kotlin/net/corda/flows/TwoPartyDealFlow.kt → finance/src/main/kotlin/net/corda/finance/flows/TwoPartyDealFlow.kt
View File

@ -1,7 +1,6 @@
package net.corda.flows package net.corda.finance.flows
import co.paralleluniverse.fibers.Suspendable import co.paralleluniverse.fibers.Suspendable
import net.corda.contracts.DealState
import net.corda.core.contracts.requireThat import net.corda.core.contracts.requireThat
import net.corda.core.crypto.SecureHash import net.corda.core.crypto.SecureHash
import net.corda.core.crypto.TransactionSignature import net.corda.core.crypto.TransactionSignature
@ -20,6 +19,7 @@ import net.corda.core.utilities.ProgressTracker
import net.corda.core.utilities.seconds import net.corda.core.utilities.seconds
import net.corda.core.utilities.trace import net.corda.core.utilities.trace
import net.corda.core.utilities.unwrap import net.corda.core.utilities.unwrap
import net.corda.finance.contracts.DealState
import java.security.PublicKey import java.security.PublicKey
/** /**

4
finance/src/main/kotlin/net/corda/flows/TwoPartyTradeFlow.kt → finance/src/main/kotlin/net/corda/finance/flows/TwoPartyTradeFlow.kt
View File

@ -1,7 +1,6 @@
package net.corda.flows package net.corda.finance.flows
import co.paralleluniverse.fibers.Suspendable import co.paralleluniverse.fibers.Suspendable
import net.corda.contracts.asset.Cash
import net.corda.core.contracts.Amount import net.corda.core.contracts.Amount
import net.corda.core.contracts.OwnableState import net.corda.core.contracts.OwnableState
import net.corda.core.contracts.StateAndRef import net.corda.core.contracts.StateAndRef
@ -17,6 +16,7 @@ import net.corda.core.transactions.TransactionBuilder
import net.corda.core.utilities.ProgressTracker import net.corda.core.utilities.ProgressTracker
import net.corda.core.utilities.seconds import net.corda.core.utilities.seconds
import net.corda.core.utilities.unwrap import net.corda.core.utilities.unwrap
import net.corda.finance.contracts.asset.Cash
import net.corda.finance.utils.sumCashBy import net.corda.finance.utils.sumCashBy
import java.security.PublicKey import java.security.PublicKey
import java.util.* import java.util.*

4
finance/src/main/kotlin/net/corda/plugin/FinanceJSONSupport.kt → finance/src/main/kotlin/net/corda/finance/plugin/FinanceJSONSupport.kt
View File

@ -1,6 +1,6 @@
@file:JvmName("FinanceJSONSupport") @file:JvmName("FinanceJSONSupport")
package net.corda.plugin package net.corda.finance.plugin
import com.fasterxml.jackson.core.JsonGenerator import com.fasterxml.jackson.core.JsonGenerator
import com.fasterxml.jackson.core.JsonParseException import com.fasterxml.jackson.core.JsonParseException
@ -8,7 +8,7 @@ import com.fasterxml.jackson.core.JsonParser
import com.fasterxml.jackson.databind.* import com.fasterxml.jackson.databind.*
import com.fasterxml.jackson.databind.deser.std.StringArrayDeserializer import com.fasterxml.jackson.databind.deser.std.StringArrayDeserializer
import com.fasterxml.jackson.databind.module.SimpleModule import com.fasterxml.jackson.databind.module.SimpleModule
import net.corda.contracts.BusinessCalendar import net.corda.finance.contracts.BusinessCalendar
import java.time.LocalDate import java.time.LocalDate
fun registerFinanceJSONMappers(objectMapper: ObjectMapper): Unit { fun registerFinanceJSONMappers(objectMapper: ObjectMapper): Unit {

4
finance/src/main/kotlin/net/corda/plugin/FinancePluginRegistry.kt → finance/src/main/kotlin/net/corda/finance/plugin/FinancePluginRegistry.kt
View File

@ -1,8 +1,8 @@
package net.corda.plugin package net.corda.finance.plugin
import net.corda.core.node.CordaPluginRegistry import net.corda.core.node.CordaPluginRegistry
import net.corda.core.schemas.MappedSchema import net.corda.core.schemas.MappedSchema
import net.corda.schemas.CashSchemaV1 import net.corda.finance.schemas.CashSchemaV1
class FinancePluginRegistry : CordaPluginRegistry() { class FinancePluginRegistry : CordaPluginRegistry() {
override val requiredSchemas: Set<MappedSchema> = setOf( override val requiredSchemas: Set<MappedSchema> = setOf(

7
finance/src/main/kotlin/net/corda/schemas/CashSchemaV1.kt → finance/src/main/kotlin/net/corda/finance/schemas/CashSchemaV1.kt
View File

@ -1,10 +1,13 @@
package net.corda.schemas package net.corda.finance.schemas
import net.corda.core.identity.AbstractParty import net.corda.core.identity.AbstractParty
import net.corda.core.schemas.MappedSchema import net.corda.core.schemas.MappedSchema
import net.corda.core.schemas.PersistentState import net.corda.core.schemas.PersistentState
import net.corda.core.serialization.CordaSerializable import net.corda.core.serialization.CordaSerializable
import javax.persistence.* import javax.persistence.Column
import javax.persistence.Entity
import javax.persistence.Index
import javax.persistence.Table
/** /**
* An object used to fully qualify the [CashSchema] family name (i.e. independent of version). * An object used to fully qualify the [CashSchema] family name (i.e. independent of version).

2
finance/src/main/kotlin/net/corda/schemas/CommercialPaperSchemaV1.kt → finance/src/main/kotlin/net/corda/finance/schemas/CommercialPaperSchemaV1.kt
View File

@ -1,4 +1,4 @@
package net.corda.schemas package net.corda.finance.schemas
import net.corda.core.schemas.MappedSchema import net.corda.core.schemas.MappedSchema
import net.corda.core.schemas.PersistentState import net.corda.core.schemas.PersistentState

8
finance/src/main/kotlin/net/corda/finance/utils/StateSummingUtilities.kt
View File

@ -1,10 +1,6 @@
@file:JvmName("StateSumming") @file:JvmName("StateSumming")
package net.corda.finance.utils package net.corda.finance.utils
import net.corda.contracts.Commodity
import net.corda.contracts.asset.Cash
import net.corda.contracts.asset.CommodityContract
import net.corda.contracts.asset.Obligation
import net.corda.core.contracts.Amount import net.corda.core.contracts.Amount
import net.corda.core.contracts.Amount.Companion.sumOrNull import net.corda.core.contracts.Amount.Companion.sumOrNull
import net.corda.core.contracts.Amount.Companion.sumOrThrow import net.corda.core.contracts.Amount.Companion.sumOrThrow
@ -13,6 +9,10 @@ import net.corda.core.contracts.ContractState
import net.corda.core.contracts.FungibleAsset import net.corda.core.contracts.FungibleAsset
import net.corda.core.contracts.Issued import net.corda.core.contracts.Issued
import net.corda.core.identity.AbstractParty import net.corda.core.identity.AbstractParty
import net.corda.finance.contracts.Commodity
import net.corda.finance.contracts.asset.Cash
import net.corda.finance.contracts.asset.CommodityContract
import net.corda.finance.contracts.asset.Obligation
import java.util.* import java.util.*
/** A collection of utilities for summing states */ /** A collection of utilities for summing states */

2
finance/src/main/resources/META-INF/services/net.corda.core.node.CordaPluginRegistry
View File

@ -1 +1 @@
net.corda.plugin.FinancePluginRegistry net.corda.finance.plugin.FinancePluginRegistry

0
finance/src/main/resources/net/corda/contracts/LondonHolidayCalendar.txt → finance/src/main/resources/net/corda/finance/contracts/LondonHolidayCalendar.txt
View File

0
finance/src/main/resources/net/corda/contracts/NewYorkHolidayCalendar.txt → finance/src/main/resources/net/corda/finance/contracts/NewYorkHolidayCalendar.txt
View File

4
finance/src/test/java/net/corda/contracts/asset/CashTestsJava.java → finance/src/test/java/net/corda/finance/contracts/asset/CashTestsJava.java
View File

@ -1,4 +1,4 @@
package net.corda.contracts.asset; package net.corda.finance.contracts.asset;
import kotlin.Unit; import kotlin.Unit;
import net.corda.core.contracts.PartyAndReference; import net.corda.core.contracts.PartyAndReference;
@ -34,7 +34,7 @@ public class CashTestsJava {
tx.tweak(tw -> { tx.tweak(tw -> {
tw.output(outState); tw.output(outState);
// No command arguments // No command arguments
return tw.failsWith("required net.corda.contracts.asset.Cash.Commands.Move command"); return tw.failsWith("required net.corda.finance.contracts.asset.Cash.Commands.Move command");
}); });
tx.tweak(tw -> { tx.tweak(tw -> {
tw.output(outState); tw.output(outState);

2
finance/src/test/java/net/corda/flows/AbstractStateReplacementFlowTest.java → finance/src/test/java/net/corda/finance/flows/AbstractStateReplacementFlowTest.java
View File

@ -1,4 +1,4 @@
package net.corda.flows; package net.corda.finance.flows;
import net.corda.core.flows.AbstractStateReplacementFlow; import net.corda.core.flows.AbstractStateReplacementFlow;
import net.corda.core.identity.Party; import net.corda.core.identity.Party;

2
finance/src/test/kotlin/net/corda/finance/CurrencyUtilsTest.kt
View File

@ -1,6 +1,6 @@
package net.corda.finance package net.corda.finance
import net.corda.core.contracts.* import net.corda.core.contracts.Amount
import org.junit.Test import org.junit.Test
import kotlin.test.assertEquals import kotlin.test.assertEquals

4
finance/src/test/kotlin/net/corda/contracts/CommercialPaperTests.kt → finance/src/test/kotlin/net/corda/finance/contracts/CommercialPaperTests.kt
View File

@ -1,6 +1,5 @@
package net.corda.contracts package net.corda.finance.contracts
import net.corda.contracts.asset.*
import net.corda.core.contracts.* import net.corda.core.contracts.*
import net.corda.core.identity.AnonymousParty import net.corda.core.identity.AnonymousParty
import net.corda.core.identity.Party import net.corda.core.identity.Party
@ -12,6 +11,7 @@ import net.corda.core.utilities.days
import net.corda.core.utilities.seconds import net.corda.core.utilities.seconds
import net.corda.finance.DOLLARS import net.corda.finance.DOLLARS
import net.corda.finance.`issued by` import net.corda.finance.`issued by`
import net.corda.finance.contracts.asset.*
import net.corda.testing.* import net.corda.testing.*
import net.corda.testing.contracts.fillWithSomeTestCash import net.corda.testing.contracts.fillWithSomeTestCash
import net.corda.testing.node.MockServices import net.corda.testing.node.MockServices

2
finance/src/test/kotlin/net/corda/contracts/FinanceTypesTest.kt → finance/src/test/kotlin/net/corda/finance/contracts/FinanceTypesTest.kt
View File

@ -1,4 +1,4 @@
package net.corda.contracts package net.corda.finance.contracts
import org.junit.Test import org.junit.Test
import java.time.LocalDate import java.time.LocalDate

6
finance/src/test/kotlin/net/corda/contracts/asset/CashTests.kt → finance/src/test/kotlin/net/corda/finance/contracts/asset/CashTests.kt
View File

@ -1,4 +1,4 @@
package net.corda.contracts.asset package net.corda.finance.contracts.asset
import net.corda.core.contracts.* import net.corda.core.contracts.*
import net.corda.core.crypto.SecureHash import net.corda.core.crypto.SecureHash
@ -93,7 +93,7 @@ class CashTests : TestDependencyInjectionBase() {
tweak { tweak {
output { outState } output { outState }
// No command arguments // No command arguments
this `fails with` "required net.corda.contracts.asset.Cash.Commands.Move command" this `fails with` "required net.corda.finance.contracts.asset.Cash.Commands.Move command"
} }
tweak { tweak {
output { outState } output { outState }
@ -353,7 +353,7 @@ class CashTests : TestDependencyInjectionBase() {
tweak { tweak {
command(MEGA_CORP_PUBKEY) { Cash.Commands.Exit(200.DOLLARS `issued by` defaultIssuer) } command(MEGA_CORP_PUBKEY) { Cash.Commands.Exit(200.DOLLARS `issued by` defaultIssuer) }
this `fails with` "required net.corda.contracts.asset.Cash.Commands.Move command" this `fails with` "required net.corda.finance.contracts.asset.Cash.Commands.Move command"
tweak { tweak {
command(MEGA_CORP_PUBKEY) { Cash.Commands.Move() } command(MEGA_CORP_PUBKEY) { Cash.Commands.Move() }

8
finance/src/test/kotlin/net/corda/contracts/asset/DummyFungibleContract.kt → finance/src/test/kotlin/net/corda/finance/contracts/asset/DummyFungibleContract.kt
View File

@ -1,4 +1,4 @@
package net.corda.contracts.asset package net.corda.finance.contracts.asset
import net.corda.core.contracts.* import net.corda.core.contracts.*
import net.corda.core.crypto.toBase58String import net.corda.core.crypto.toBase58String
@ -11,9 +11,9 @@ import net.corda.core.transactions.LedgerTransaction
import net.corda.finance.utils.sumCash import net.corda.finance.utils.sumCash
import net.corda.finance.utils.sumCashOrNull import net.corda.finance.utils.sumCashOrNull
import net.corda.finance.utils.sumCashOrZero import net.corda.finance.utils.sumCashOrZero
import net.corda.schemas.SampleCashSchemaV1 import net.corda.finance.schemas.SampleCashSchemaV1
import net.corda.schemas.SampleCashSchemaV2 import net.corda.finance.schemas.SampleCashSchemaV2
import net.corda.schemas.SampleCashSchemaV3 import net.corda.finance.schemas.SampleCashSchemaV3
import java.security.PublicKey import java.security.PublicKey
import java.util.* import java.util.*

12
finance/src/test/kotlin/net/corda/contracts/asset/ObligationTests.kt → finance/src/test/kotlin/net/corda/finance/contracts/asset/ObligationTests.kt
View File

@ -1,8 +1,5 @@
package net.corda.contracts.asset package net.corda.finance.contracts.asset
import net.corda.contracts.Commodity
import net.corda.contracts.NetType
import net.corda.contracts.asset.Obligation.Lifecycle
import net.corda.core.contracts.* import net.corda.core.contracts.*
import net.corda.core.crypto.SecureHash import net.corda.core.crypto.SecureHash
import net.corda.core.crypto.sha256 import net.corda.core.crypto.sha256
@ -15,6 +12,9 @@ import net.corda.core.utilities.OpaqueBytes
import net.corda.core.utilities.days import net.corda.core.utilities.days
import net.corda.core.utilities.hours import net.corda.core.utilities.hours
import net.corda.finance.* import net.corda.finance.*
import net.corda.finance.contracts.Commodity
import net.corda.finance.contracts.NetType
import net.corda.finance.contracts.asset.Obligation.Lifecycle
import net.corda.testing.* import net.corda.testing.*
import net.corda.testing.contracts.DummyState import net.corda.testing.contracts.DummyState
import net.corda.testing.node.MockServices import net.corda.testing.node.MockServices
@ -80,7 +80,7 @@ class ObligationTests {
output { outState } output { outState }
command(CHARLIE.owningKey) { DummyCommandData } command(CHARLIE.owningKey) { DummyCommandData }
// Invalid command // Invalid command
this `fails with` "required net.corda.contracts.asset.Obligation.Commands.Move command" this `fails with` "required net.corda.finance.contracts.asset.Obligation.Commands.Move command"
} }
tweak { tweak {
output { outState } output { outState }
@ -680,7 +680,7 @@ class ObligationTests {
tweak { tweak {
command(CHARLIE.owningKey) { Obligation.Commands.Exit(Amount(200.DOLLARS.quantity, inState.amount.token)) } command(CHARLIE.owningKey) { Obligation.Commands.Exit(Amount(200.DOLLARS.quantity, inState.amount.token)) }
this `fails with` "required net.corda.contracts.asset.Obligation.Commands.Move command" this `fails with` "required net.corda.finance.contracts.asset.Obligation.Commands.Move command"
tweak { tweak {
command(CHARLIE.owningKey) { Obligation.Commands.Move() } command(CHARLIE.owningKey) { Obligation.Commands.Move() }

2
finance/src/test/kotlin/net/corda/contracts/math/InterpolatorsTest.kt → finance/src/test/kotlin/net/corda/finance/contracts/math/InterpolatorsTest.kt
View File

@ -1,4 +1,4 @@
package net.corda.contracts.math package net.corda.finance.contracts.math
import org.junit.Assert import org.junit.Assert
import org.junit.Test import org.junit.Test

8
finance/src/test/kotlin/net/corda/flows/CashExitFlowTests.kt → finance/src/test/kotlin/net/corda/finance/flows/CashExitFlowTests.kt
View File

@ -1,11 +1,11 @@
package net.corda.flows package net.corda.finance.flows
import net.corda.contracts.asset.Cash
import net.corda.finance.DOLLARS
import net.corda.finance.`issued by`
import net.corda.core.identity.Party import net.corda.core.identity.Party
import net.corda.core.utilities.OpaqueBytes import net.corda.core.utilities.OpaqueBytes
import net.corda.core.utilities.getOrThrow import net.corda.core.utilities.getOrThrow
import net.corda.finance.DOLLARS
import net.corda.finance.`issued by`
import net.corda.finance.contracts.asset.Cash
import net.corda.testing.node.InMemoryMessagingNetwork.ServicePeerAllocationStrategy.RoundRobin import net.corda.testing.node.InMemoryMessagingNetwork.ServicePeerAllocationStrategy.RoundRobin
import net.corda.testing.node.MockNetwork import net.corda.testing.node.MockNetwork
import net.corda.testing.node.MockNetwork.MockNode import net.corda.testing.node.MockNetwork.MockNode

8
finance/src/test/kotlin/net/corda/flows/CashIssueFlowTests.kt → finance/src/test/kotlin/net/corda/finance/flows/CashIssueFlowTests.kt
View File

@ -1,11 +1,11 @@
package net.corda.flows package net.corda.finance.flows
import net.corda.contracts.asset.Cash
import net.corda.finance.DOLLARS
import net.corda.finance.`issued by`
import net.corda.core.identity.Party import net.corda.core.identity.Party
import net.corda.core.utilities.OpaqueBytes import net.corda.core.utilities.OpaqueBytes
import net.corda.core.utilities.getOrThrow import net.corda.core.utilities.getOrThrow
import net.corda.finance.DOLLARS
import net.corda.finance.`issued by`
import net.corda.finance.contracts.asset.Cash
import net.corda.testing.node.InMemoryMessagingNetwork.ServicePeerAllocationStrategy.RoundRobin import net.corda.testing.node.InMemoryMessagingNetwork.ServicePeerAllocationStrategy.RoundRobin
import net.corda.testing.node.MockNetwork import net.corda.testing.node.MockNetwork
import net.corda.testing.node.MockNetwork.MockNode import net.corda.testing.node.MockNetwork.MockNode

8
finance/src/test/kotlin/net/corda/flows/CashPaymentFlowTests.kt → finance/src/test/kotlin/net/corda/finance/flows/CashPaymentFlowTests.kt
View File

@ -1,14 +1,14 @@
package net.corda.flows package net.corda.finance.flows
import net.corda.contracts.asset.Cash
import net.corda.finance.DOLLARS
import net.corda.finance.`issued by`
import net.corda.core.identity.Party import net.corda.core.identity.Party
import net.corda.core.node.services.Vault import net.corda.core.node.services.Vault
import net.corda.core.node.services.trackBy import net.corda.core.node.services.trackBy
import net.corda.core.node.services.vault.QueryCriteria import net.corda.core.node.services.vault.QueryCriteria
import net.corda.core.utilities.OpaqueBytes import net.corda.core.utilities.OpaqueBytes
import net.corda.core.utilities.getOrThrow import net.corda.core.utilities.getOrThrow
import net.corda.finance.DOLLARS
import net.corda.finance.`issued by`
import net.corda.finance.contracts.asset.Cash
import net.corda.testing.expect import net.corda.testing.expect
import net.corda.testing.expectEvents import net.corda.testing.expectEvents
import net.corda.testing.node.InMemoryMessagingNetwork.ServicePeerAllocationStrategy.RoundRobin import net.corda.testing.node.InMemoryMessagingNetwork.ServicePeerAllocationStrategy.RoundRobin

7
finance/src/test/kotlin/net/corda/schemas/SampleCashSchemaV1.kt → finance/src/test/kotlin/net/corda/finance/schemas/SampleCashSchemaV1.kt
View File

@ -1,8 +1,11 @@
package net.corda.schemas package net.corda.finance.schemas
import net.corda.core.schemas.MappedSchema import net.corda.core.schemas.MappedSchema
import net.corda.core.schemas.PersistentState import net.corda.core.schemas.PersistentState
import javax.persistence.* import javax.persistence.Column
import javax.persistence.Entity
import javax.persistence.Index
import javax.persistence.Table
/** /**
* An object used to fully qualify the [CashSchema] family name (i.e. independent of version). * An object used to fully qualify the [CashSchema] family name (i.e. independent of version).

4
finance/src/test/kotlin/net/corda/schemas/SampleCashSchemaV2.kt → finance/src/test/kotlin/net/corda/finance/schemas/SampleCashSchemaV2.kt
View File

@ -1,8 +1,8 @@
package net.corda.schemas package net.corda.finance.schemas
import net.corda.core.identity.AbstractParty import net.corda.core.identity.AbstractParty
import net.corda.core.schemas.MappedSchema
import net.corda.core.schemas.CommonSchemaV1 import net.corda.core.schemas.CommonSchemaV1
import net.corda.core.schemas.MappedSchema
import javax.persistence.Column import javax.persistence.Column
import javax.persistence.Entity import javax.persistence.Entity
import javax.persistence.Index import javax.persistence.Index

8
finance/src/test/kotlin/net/corda/schemas/SampleCashSchemaV3.kt → finance/src/test/kotlin/net/corda/finance/schemas/SampleCashSchemaV3.kt
View File

@ -1,10 +1,12 @@
package net.corda.schemas package net.corda.finance.schemas
import net.corda.core.identity.AbstractParty import net.corda.core.identity.AbstractParty
import net.corda.core.schemas.MappedSchema import net.corda.core.schemas.MappedSchema
import net.corda.core.schemas.PersistentState import net.corda.core.schemas.PersistentState
import net.corda.core.schemas.CommonSchemaV1 import javax.persistence.Column
import javax.persistence.* import javax.persistence.ElementCollection
import javax.persistence.Entity
import javax.persistence.Table
/** /**
* First version of a cash contract ORM schema that maps all fields of the [Cash] contract state as it stood * First version of a cash contract ORM schema that maps all fields of the [Cash] contract state as it stood

2
finance/src/test/kotlin/net/corda/schemas/SampleCommercialPaperSchemaV1.kt → finance/src/test/kotlin/net/corda/finance/schemas/SampleCommercialPaperSchemaV1.kt
View File

@ -1,4 +1,4 @@
package net.corda.schemas package net.corda.finance.schemas
import net.corda.core.schemas.MappedSchema import net.corda.core.schemas.MappedSchema
import net.corda.core.schemas.PersistentState import net.corda.core.schemas.PersistentState

4
finance/src/test/kotlin/net/corda/schemas/SampleCommercialPaperSchemaV2.kt → finance/src/test/kotlin/net/corda/finance/schemas/SampleCommercialPaperSchemaV2.kt
View File

@ -1,8 +1,8 @@
package net.corda.schemas package net.corda.finance.schemas
import net.corda.core.identity.AbstractParty import net.corda.core.identity.AbstractParty
import net.corda.core.schemas.MappedSchema
import net.corda.core.schemas.CommonSchemaV1 import net.corda.core.schemas.CommonSchemaV1
import net.corda.core.schemas.MappedSchema
import java.time.Instant import java.time.Instant
import javax.persistence.Column import javax.persistence.Column
import javax.persistence.Entity import javax.persistence.Entity

10
node/src/integration-test/kotlin/net/corda/node/NodePerformanceTests.kt
View File

@ -2,22 +2,22 @@ package net.corda.node
import co.paralleluniverse.fibers.Suspendable import co.paralleluniverse.fibers.Suspendable
import com.google.common.base.Stopwatch import com.google.common.base.Stopwatch
import net.corda.finance.DOLLARS
import net.corda.core.flows.FlowLogic import net.corda.core.flows.FlowLogic
import net.corda.core.flows.StartableByRPC import net.corda.core.flows.StartableByRPC
import net.corda.core.internal.concurrent.transpose import net.corda.core.internal.concurrent.transpose
import net.corda.core.messaging.startFlow import net.corda.core.messaging.startFlow
import net.corda.core.utilities.minutes
import net.corda.core.node.services.ServiceInfo import net.corda.core.node.services.ServiceInfo
import net.corda.core.utilities.OpaqueBytes import net.corda.core.utilities.OpaqueBytes
import net.corda.testing.performance.div import net.corda.core.utilities.minutes
import net.corda.flows.CashIssueFlow import net.corda.finance.DOLLARS
import net.corda.flows.CashPaymentFlow import net.corda.finance.flows.CashIssueFlow
import net.corda.finance.flows.CashPaymentFlow
import net.corda.node.services.startFlowPermission import net.corda.node.services.startFlowPermission
import net.corda.node.services.transactions.SimpleNotaryService import net.corda.node.services.transactions.SimpleNotaryService
import net.corda.nodeapi.User import net.corda.nodeapi.User
import net.corda.testing.driver.NodeHandle import net.corda.testing.driver.NodeHandle
import net.corda.testing.driver.driver import net.corda.testing.driver.driver
import net.corda.testing.performance.div
import net.corda.testing.performance.startPublishingFixedRateInjector import net.corda.testing.performance.startPublishingFixedRateInjector
import net.corda.testing.performance.startReporter import net.corda.testing.performance.startReporter
import net.corda.testing.performance.startTightLoopInjector import net.corda.testing.performance.startTightLoopInjector

8
node/src/integration-test/kotlin/net/corda/node/services/DistributedServiceTests.kt
View File

@ -1,7 +1,6 @@
package net.corda.node.services package net.corda.node.services
import net.corda.core.contracts.Amount import net.corda.core.contracts.Amount
import net.corda.finance.POUNDS
import net.corda.core.identity.Party import net.corda.core.identity.Party
import net.corda.core.internal.bufferUntilSubscribed import net.corda.core.internal.bufferUntilSubscribed
import net.corda.core.messaging.CordaRPCOps import net.corda.core.messaging.CordaRPCOps
@ -10,10 +9,9 @@ import net.corda.core.messaging.startFlow
import net.corda.core.node.NodeInfo import net.corda.core.node.NodeInfo
import net.corda.core.utilities.OpaqueBytes import net.corda.core.utilities.OpaqueBytes
import net.corda.core.utilities.getOrThrow import net.corda.core.utilities.getOrThrow
import net.corda.testing.ALICE import net.corda.finance.POUNDS
import net.corda.testing.DUMMY_NOTARY import net.corda.finance.flows.CashIssueFlow
import net.corda.flows.CashIssueFlow import net.corda.finance.flows.CashPaymentFlow
import net.corda.flows.CashPaymentFlow
import net.corda.node.services.transactions.RaftValidatingNotaryService import net.corda.node.services.transactions.RaftValidatingNotaryService
import net.corda.nodeapi.User import net.corda.nodeapi.User
import net.corda.testing.* import net.corda.testing.*

18
node/src/test/java/net/corda/node/services/vault/VaultQueryJavaTests.java
View File

@ -1,10 +1,8 @@
package net.corda.node.services.vault; package net.corda.node.services.vault;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import kotlin.*; import kotlin.Pair;
import net.corda.contracts.DealState; import kotlin.Triple;
import net.corda.contracts.asset.Cash;
import net.corda.contracts.asset.CashUtilities;
import net.corda.core.contracts.*; import net.corda.core.contracts.*;
import net.corda.core.crypto.EncodingUtils; import net.corda.core.crypto.EncodingUtils;
import net.corda.core.identity.AbstractParty; import net.corda.core.identity.AbstractParty;
@ -19,8 +17,12 @@ import net.corda.core.node.services.vault.QueryCriteria.VaultCustomQueryCriteria
import net.corda.core.node.services.vault.QueryCriteria.VaultQueryCriteria; import net.corda.core.node.services.vault.QueryCriteria.VaultQueryCriteria;
import net.corda.core.schemas.MappedSchema; import net.corda.core.schemas.MappedSchema;
import net.corda.core.utilities.OpaqueBytes; import net.corda.core.utilities.OpaqueBytes;
import net.corda.node.utilities.*; import net.corda.finance.contracts.DealState;
import net.corda.schemas.CashSchemaV1; import net.corda.finance.contracts.asset.Cash;
import net.corda.finance.contracts.asset.CashUtilities;
import net.corda.finance.schemas.CashSchemaV1;
import net.corda.node.utilities.CordaPersistence;
import net.corda.node.utilities.DatabaseTransaction;
import net.corda.testing.TestConstants; import net.corda.testing.TestConstants;
import net.corda.testing.TestDependencyInjectionBase; import net.corda.testing.TestDependencyInjectionBase;
import net.corda.testing.contracts.DummyLinearContract; import net.corda.testing.contracts.DummyLinearContract;
@ -39,11 +41,11 @@ import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
import java.util.stream.StreamSupport; import java.util.stream.StreamSupport;
import static net.corda.contracts.asset.CashUtilities.getDUMMY_CASH_ISSUER;
import static net.corda.contracts.asset.CashUtilities.getDUMMY_CASH_ISSUER_KEY;
import static net.corda.core.node.services.vault.QueryCriteriaUtils.DEFAULT_PAGE_NUM; import static net.corda.core.node.services.vault.QueryCriteriaUtils.DEFAULT_PAGE_NUM;
import static net.corda.core.node.services.vault.QueryCriteriaUtils.MAX_PAGE_SIZE; import static net.corda.core.node.services.vault.QueryCriteriaUtils.MAX_PAGE_SIZE;
import static net.corda.core.utilities.ByteArrays.toHexString; import static net.corda.core.utilities.ByteArrays.toHexString;
import static net.corda.finance.contracts.asset.CashUtilities.getDUMMY_CASH_ISSUER;
import static net.corda.finance.contracts.asset.CashUtilities.getDUMMY_CASH_ISSUER_KEY;
import static net.corda.testing.CoreTestUtils.*; import static net.corda.testing.CoreTestUtils.*;
import static net.corda.testing.TestConstants.getDUMMY_NOTARY; import static net.corda.testing.TestConstants.getDUMMY_NOTARY;
import static net.corda.testing.TestConstants.getDUMMY_NOTARY_KEY; import static net.corda.testing.TestConstants.getDUMMY_NOTARY_KEY;

14
node/src/test/kotlin/net/corda/node/CordaRPCOpsImplTest.kt
View File

@ -1,8 +1,9 @@
package net.corda.node package net.corda.node
import co.paralleluniverse.fibers.Suspendable import co.paralleluniverse.fibers.Suspendable
import net.corda.contracts.asset.Cash import net.corda.core.contracts.Amount
import net.corda.core.contracts.* import net.corda.core.contracts.ContractState
import net.corda.core.contracts.Issued
import net.corda.core.crypto.isFulfilledBy import net.corda.core.crypto.isFulfilledBy
import net.corda.core.crypto.keys import net.corda.core.crypto.keys
import net.corda.core.flows.FlowLogic import net.corda.core.flows.FlowLogic
@ -10,15 +11,16 @@ import net.corda.core.flows.StateMachineRunId
import net.corda.core.messaging.* import net.corda.core.messaging.*
import net.corda.core.node.services.ServiceInfo import net.corda.core.node.services.ServiceInfo
import net.corda.core.node.services.Vault import net.corda.core.node.services.Vault
import net.corda.core.transactions.SignedTransaction
import net.corda.core.utilities.getOrThrow
import net.corda.core.node.services.queryBy import net.corda.core.node.services.queryBy
import net.corda.core.transactions.SignedTransaction
import net.corda.core.utilities.OpaqueBytes import net.corda.core.utilities.OpaqueBytes
import net.corda.core.utilities.getOrThrow
import net.corda.finance.DOLLARS import net.corda.finance.DOLLARS
import net.corda.finance.GBP import net.corda.finance.GBP
import net.corda.finance.USD import net.corda.finance.USD
import net.corda.flows.CashIssueFlow import net.corda.finance.contracts.asset.Cash
import net.corda.flows.CashPaymentFlow import net.corda.finance.flows.CashIssueFlow
import net.corda.finance.flows.CashPaymentFlow
import net.corda.node.internal.CordaRPCOpsImpl import net.corda.node.internal.CordaRPCOpsImpl
import net.corda.node.services.messaging.CURRENT_RPC_CONTEXT import net.corda.node.services.messaging.CURRENT_RPC_CONTEXT
import net.corda.node.services.messaging.RpcContext import net.corda.node.services.messaging.RpcContext

14
node/src/test/kotlin/net/corda/node/messaging/TwoPartyTradeFlowTests.kt
View File

@ -1,11 +1,6 @@
package net.corda.node.messaging package net.corda.node.messaging
import co.paralleluniverse.fibers.Suspendable import co.paralleluniverse.fibers.Suspendable
import net.corda.contracts.CommercialPaper
import net.corda.contracts.asset.CASH
import net.corda.contracts.asset.Cash
import net.corda.contracts.asset.`issued by`
import net.corda.contracts.asset.`owned by`
import net.corda.core.concurrent.CordaFuture import net.corda.core.concurrent.CordaFuture
import net.corda.core.contracts.* import net.corda.core.contracts.*
import net.corda.core.crypto.* import net.corda.core.crypto.*
@ -35,8 +30,13 @@ import net.corda.core.utilities.toNonEmptySet
import net.corda.core.utilities.unwrap import net.corda.core.utilities.unwrap
import net.corda.finance.DOLLARS import net.corda.finance.DOLLARS
import net.corda.finance.`issued by` import net.corda.finance.`issued by`
import net.corda.flows.TwoPartyTradeFlow.Buyer import net.corda.finance.contracts.CommercialPaper
import net.corda.flows.TwoPartyTradeFlow.Seller import net.corda.finance.contracts.asset.CASH
import net.corda.finance.contracts.asset.Cash
import net.corda.finance.contracts.asset.`issued by`
import net.corda.finance.contracts.asset.`owned by`
import net.corda.finance.flows.TwoPartyTradeFlow.Buyer
import net.corda.finance.flows.TwoPartyTradeFlow.Seller
import net.corda.node.internal.AbstractNode import net.corda.node.internal.AbstractNode
import net.corda.node.services.api.WritableTransactionStorage import net.corda.node.services.api.WritableTransactionStorage
import net.corda.node.services.config.NodeConfiguration import net.corda.node.services.config.NodeConfiguration

16
node/src/test/kotlin/net/corda/node/services/database/HibernateConfigurationTest.kt
View File

@ -1,7 +1,9 @@
package net.corda.node.services.database package net.corda.node.services.database
import net.corda.contracts.asset.* import net.corda.core.contracts.ContractState
import net.corda.core.contracts.* import net.corda.core.contracts.StateAndRef
import net.corda.core.contracts.StateRef
import net.corda.core.contracts.TransactionState
import net.corda.core.crypto.SecureHash import net.corda.core.crypto.SecureHash
import net.corda.core.crypto.toBase58String import net.corda.core.crypto.toBase58String
import net.corda.core.node.services.Vault import net.corda.core.node.services.Vault
@ -13,15 +15,19 @@ import net.corda.core.transactions.SignedTransaction
import net.corda.finance.DOLLARS import net.corda.finance.DOLLARS
import net.corda.finance.POUNDS import net.corda.finance.POUNDS
import net.corda.finance.SWISS_FRANCS import net.corda.finance.SWISS_FRANCS
import net.corda.finance.contracts.asset.Cash
import net.corda.finance.contracts.asset.DUMMY_CASH_ISSUER
import net.corda.finance.contracts.asset.DUMMY_CASH_ISSUER_KEY
import net.corda.finance.contracts.asset.DummyFungibleContract
import net.corda.finance.schemas.CashSchemaV1
import net.corda.finance.schemas.SampleCashSchemaV2
import net.corda.finance.schemas.SampleCashSchemaV3
import net.corda.finance.utils.sumCash import net.corda.finance.utils.sumCash
import net.corda.node.services.schema.HibernateObserver import net.corda.node.services.schema.HibernateObserver
import net.corda.node.services.schema.NodeSchemaService import net.corda.node.services.schema.NodeSchemaService
import net.corda.node.services.vault.VaultSchemaV1 import net.corda.node.services.vault.VaultSchemaV1
import net.corda.node.utilities.CordaPersistence import net.corda.node.utilities.CordaPersistence
import net.corda.node.utilities.configureDatabase import net.corda.node.utilities.configureDatabase
import net.corda.schemas.CashSchemaV1
import net.corda.schemas.SampleCashSchemaV2
import net.corda.schemas.SampleCashSchemaV3
import net.corda.testing.* import net.corda.testing.*
import net.corda.testing.contracts.consumeCash import net.corda.testing.contracts.consumeCash
import net.corda.testing.contracts.fillWithSomeTestCash import net.corda.testing.contracts.fillWithSomeTestCash

6
node/src/test/kotlin/net/corda/node/services/persistence/DBTransactionStorageTests.kt
View File

@ -10,6 +10,9 @@ import net.corda.core.schemas.MappedSchema
import net.corda.core.toFuture import net.corda.core.toFuture
import net.corda.core.transactions.SignedTransaction import net.corda.core.transactions.SignedTransaction
import net.corda.core.transactions.WireTransaction import net.corda.core.transactions.WireTransaction
import net.corda.finance.schemas.CashSchemaV1
import net.corda.finance.schemas.SampleCashSchemaV2
import net.corda.finance.schemas.SampleCashSchemaV3
import net.corda.node.services.database.HibernateConfiguration import net.corda.node.services.database.HibernateConfiguration
import net.corda.node.services.schema.HibernateObserver import net.corda.node.services.schema.HibernateObserver
import net.corda.node.services.schema.NodeSchemaService import net.corda.node.services.schema.NodeSchemaService
@ -18,9 +21,6 @@ import net.corda.node.services.vault.NodeVaultService
import net.corda.node.services.vault.VaultSchemaV1 import net.corda.node.services.vault.VaultSchemaV1
import net.corda.node.utilities.CordaPersistence import net.corda.node.utilities.CordaPersistence
import net.corda.node.utilities.configureDatabase import net.corda.node.utilities.configureDatabase
import net.corda.schemas.CashSchemaV1
import net.corda.schemas.SampleCashSchemaV2
import net.corda.schemas.SampleCashSchemaV3
import net.corda.testing.* import net.corda.testing.*
import net.corda.testing.node.MockServices import net.corda.testing.node.MockServices
import net.corda.testing.node.makeTestDataSourceProperties import net.corda.testing.node.makeTestDataSourceProperties

4
node/src/test/kotlin/net/corda/node/services/persistence/DataVendingServiceTests.kt
View File

@ -1,10 +1,8 @@
package net.corda.node.services.persistence package net.corda.node.services.persistence
import co.paralleluniverse.fibers.Suspendable import co.paralleluniverse.fibers.Suspendable
import net.corda.contracts.asset.Cash
import net.corda.core.contracts.Amount import net.corda.core.contracts.Amount
import net.corda.core.contracts.Issued import net.corda.core.contracts.Issued
import net.corda.finance.USD
import net.corda.core.flows.FlowLogic import net.corda.core.flows.FlowLogic
import net.corda.core.flows.InitiatedBy import net.corda.core.flows.InitiatedBy
import net.corda.core.flows.InitiatingFlow import net.corda.core.flows.InitiatingFlow
@ -13,6 +11,8 @@ import net.corda.core.identity.Party
import net.corda.core.node.services.queryBy import net.corda.core.node.services.queryBy
import net.corda.core.transactions.SignedTransaction import net.corda.core.transactions.SignedTransaction
import net.corda.core.transactions.TransactionBuilder import net.corda.core.transactions.TransactionBuilder
import net.corda.finance.USD
import net.corda.finance.contracts.asset.Cash
import net.corda.node.services.NotifyTransactionHandler import net.corda.node.services.NotifyTransactionHandler
import net.corda.testing.DUMMY_NOTARY import net.corda.testing.DUMMY_NOTARY
import net.corda.testing.MEGA_CORP import net.corda.testing.MEGA_CORP

6
node/src/test/kotlin/net/corda/node/services/statemachine/FlowFrameworkTests.kt
View File

@ -5,7 +5,6 @@ import co.paralleluniverse.fibers.Suspendable
import co.paralleluniverse.strands.concurrent.Semaphore import co.paralleluniverse.strands.concurrent.Semaphore
import net.corda.core.concurrent.CordaFuture import net.corda.core.concurrent.CordaFuture
import net.corda.core.contracts.ContractState import net.corda.core.contracts.ContractState
import net.corda.finance.DOLLARS
import net.corda.core.contracts.StateAndRef import net.corda.core.contracts.StateAndRef
import net.corda.core.crypto.generateKeyPair import net.corda.core.crypto.generateKeyPair
import net.corda.core.crypto.random63BitValue import net.corda.core.crypto.random63BitValue
@ -27,8 +26,9 @@ import net.corda.core.utilities.ProgressTracker
import net.corda.core.utilities.ProgressTracker.Change import net.corda.core.utilities.ProgressTracker.Change
import net.corda.core.utilities.getOrThrow import net.corda.core.utilities.getOrThrow
import net.corda.core.utilities.unwrap import net.corda.core.utilities.unwrap
import net.corda.flows.CashIssueFlow import net.corda.finance.DOLLARS
import net.corda.flows.CashPaymentFlow import net.corda.finance.flows.CashIssueFlow
import net.corda.finance.flows.CashPaymentFlow
import net.corda.node.internal.InitiatedFlowFactory import net.corda.node.internal.InitiatedFlowFactory
import net.corda.node.services.network.NetworkMapService import net.corda.node.services.network.NetworkMapService
import net.corda.node.services.persistence.checkpoints import net.corda.node.services.persistence.checkpoints

13
node/src/test/kotlin/net/corda/node/services/vault/NodeVaultServiceTest.kt
View File

@ -1,11 +1,10 @@
package net.corda.node.services.vault package net.corda.node.services.vault
import co.paralleluniverse.fibers.Suspendable import co.paralleluniverse.fibers.Suspendable
import net.corda.contracts.asset.Cash import net.corda.core.contracts.Amount
import net.corda.contracts.asset.DUMMY_CASH_ISSUER import net.corda.core.contracts.Issued
import net.corda.contracts.asset.DUMMY_CASH_ISSUER_KEY import net.corda.core.contracts.StateAndRef
import net.corda.contracts.getCashBalance import net.corda.core.contracts.StateRef
import net.corda.core.contracts.*
import net.corda.core.crypto.generateKeyPair import net.corda.core.crypto.generateKeyPair
import net.corda.core.identity.AbstractParty import net.corda.core.identity.AbstractParty
import net.corda.core.identity.AnonymousParty import net.corda.core.identity.AnonymousParty
@ -20,6 +19,10 @@ import net.corda.core.utilities.NonEmptySet
import net.corda.core.utilities.OpaqueBytes import net.corda.core.utilities.OpaqueBytes
import net.corda.core.utilities.toNonEmptySet import net.corda.core.utilities.toNonEmptySet
import net.corda.finance.* import net.corda.finance.*
import net.corda.finance.contracts.asset.Cash
import net.corda.finance.contracts.asset.DUMMY_CASH_ISSUER
import net.corda.finance.contracts.asset.DUMMY_CASH_ISSUER_KEY
import net.corda.finance.contracts.getCashBalance
import net.corda.finance.utils.sumCash import net.corda.finance.utils.sumCash
import net.corda.node.utilities.CordaPersistence import net.corda.node.utilities.CordaPersistence
import net.corda.testing.* import net.corda.testing.*

Some files were not shown because too many files have changed in this diff Show More