tudor.malene@gmail.com
7b86c2c3a3
Merge remote-tracking branch 'private/master' into tudor_os_merge_23_10
...
# Conflicts:
# core/src/main/kotlin/net/corda/core/contracts/BelongsToContract.kt
# core/src/main/kotlin/net/corda/core/contracts/TransactionState.kt
# core/src/main/kotlin/net/corda/core/transactions/LedgerTransaction.kt
# core/src/main/kotlin/net/corda/core/transactions/TransactionBuilder.kt
# core/src/main/kotlin/net/corda/core/utilities/KotlinUtils.kt
# core/src/test/kotlin/net/corda/core/internal/JarSignatureCollectorTest.kt
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# node/src/main/kotlin/net/corda/node/internal/cordapp/JarScanningCordappLoader.kt
# node/src/test/kotlin/net/corda/node/services/persistence/NodeAttachmentServiceTest.kt
# testing/test-utils/src/main/kotlin/net/corda/testing/dsl/TransactionDSLInterpreter.kt
2018-10-23 10:29:43 +01:00
rick.parker
b571e16d0d
Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-20181018-1
2018-10-19 08:02:59 +01:00
Rick Parker
55731ef816
ENT-2431 Tidy up buildNamed and CacheFactory
2018-10-18 10:38:43 +01:00
Chris Rankin
430c4bcf83
Merge commit '47068e6b7ad0afb3ed8df61a429470f19331b7b5' into chrisr3-os-merf
...
Conflicts:
docs/source/index.rst
finance/build.gradle
finance/src/integration-test/kotlin/net/corda/finance/flows/test/CashConfigDataFlowTest.kt
node/src/test/java/net/corda/node/services/vault/VaultQueryJavaTests.java
samples/simm-valuation-demo/build.gradle
2018-10-16 12:07:55 +01:00
Florian Friemel
47068e6b7a
[CORDA-2077] Use latest gradle plugin version (4.0.32), set target version in core and sample CorDapps ( #4038 )
...
* Upgrade gradle plugin; add target version attribute to finance and sample cordapps.
* Remove '-SNAPSHOT' from gradlePluginsVersion.
* Fix naming.
* Update docs.
* Respond to feedback.
* Fix irs demo
* Fix more samples
* Fix more samples
* Fix deployNodes
* Fix deployNodes
* more fixes
* fix simm valuation
* more fixes
* more fixes
* more fixes
* more fixes
* Publication should have *nothing* to do with cordformation and deployNodes.
Remove it! And if this exposes a bug then "so be it".
* Disable CorDapp signing for Cordapp Configuration and Network Verifier.
* Disable CorDapp signing for SIMM Valuation Demo.
* Remove remaining publishing nonsense from samples.
* Workarounds fpr cordapp-configuration, network-verifier and simm-valuation-demo:
JarSigner rejects jars with duplicates inside, so remove them.
* Upgrade to Gradle plugin 4.0.32 and reenable CorDapp signing for samples.
2018-10-15 21:11:52 +01:00
Tudor Malene
f96a59932c
ENT-2222 Constraints propagation
...
ENT-2222 Fix tests
ENT-2222 Fix tests
ENT-2222 Add ledger transaction verification logic
ENT-2222 Fixed IRS test
ENT-2222 Fixed IRS test
ENT-2222 Fixed unit test
ENT-2222 Better kdocs
ENT-2222 Support for reference states
ENT-2222 Fix support for reference states
ENT-2222 Revert wrong change
ENT-2222 Fix Kdoc
ENT-2222 Fix Kdoc
ENT-2222 Better docs
ENT-2222 Address code review comments
ENT-2222 Fix test
ENT-2222 Fix rebase
ENT-2222 Add documentation around constraint propagation
ENT-2222 Add tests for contract propagation
ENT-2222 Add Signature Constraints propagation - first draft
ENT-2222 fix tests
ENT-2222 more tests
ENT-2222 unseal the TransactionVerificationException
ENT-2222 unseal the TransactionVerificationException
ENT-2222 more docs
ENT-2222 address code review comments
ENT-2222 address code review comments
ENT-2222 re-implement transition logic
ENT-2222 better comments and checks
ENT-2222 Fix tests
ENT-2222 merge fixes
2018-09-28 13:38:35 +01:00
Shams Asari
725441b39c
Minor changes to bring in-sync with OS ( #1390 )
2018-09-13 12:53:06 +01:00
Shams Asari
11e2bef240
ENT-2473: Removed copyright headers ( #1364 )
2018-09-03 16:38:52 +01:00
szymonsztuka
a63c9526ca
Merge OS
2018-08-01 14:13:39 +01:00
szymonsztuka
c23167f08e
ENT-2188 fix H2 insecure default configuration ( #3692 )
...
Set the "h2.allowedClasses" system property, require database password when exposing H2 server on non-localhost address, samples start H2 server by default (reintroduces the behaviour before h2Settings.address configuration option was added)
2018-08-01 11:50:42 +01:00
Viktor Kolomeyko
61a8bd0a5a
Merge remote-tracking branch 'open/master' into feature/vkolomeyko/os-merge
...
# Conflicts:
# samples/attachment-demo/src/integration-test/kotlin/net/corda/attachmentdemo/AttachmentDemoTest.kt
2018-07-09 16:45:20 +01:00
Viktor Kolomeyko
d481c55b82
CORDA-1743: Remove isDebug = true
from Node driver to speed-up integration tests execution. ( #3535 )
...
* CORDA-1743: Remove `isDebug = true` from Node driver to speed-up integration tests execution.
* CORDA-1743: Undo removal of "isDebug = true" from the test that specifically checks for this condition.
* CORDA-1743: Address input from @shamsasari
2018-07-09 16:37:01 +01:00
Shams Asari
5d55a87d70
Merge remote-tracking branch 'open/master' into os-merge-aefd90f
...
# Conflicts:
# CONTRIBUTORS.md
2018-07-09 12:33:47 +01:00
Shams Asari
aefd90f062
Minor: ProcessUtilities clean up ( #3533 )
2018-07-09 12:29:33 +01:00
Shams Asari
20a589d66d
Merge remote-tracking branch 'open/master' into os-merge-244167d
...
# Conflicts:
# docs/source/example-code/src/main/kotlin/net/corda/docs/FlowCookbook.kt
# docs/source/example-code/src/main/kotlin/net/corda/docs/LaunchSpaceshipFlow.kt
# docs/source/example-code/src/main/kotlin/net/corda/docs/tutorial/tearoffs/TutorialTearOffs.kt
# docs/source/running-a-node.rst
# experimental/behave/build.gradle
# experimental/behave/src/scenario/kotlin/net/corda/behave/scenarios/helpers/Substeps.kt
# experimental/kryo-hook/build.gradle
# experimental/quasar-hook/build.gradle
# node/src/integration-test/kotlin/net/corda/node/AuthDBTests.kt
# node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
# node/src/test/java/net/corda/node/services/vault/VaultQueryJavaTests.java
# node/src/test/kotlin/net/corda/node/internal/NodeTest.kt
# node/src/test/kotlin/net/corda/node/services/messaging/ArtemisMessagingTest.kt
# node/src/test/kotlin/net/corda/node/services/persistence/HibernateConfigurationTest.kt
# samples/attachment-demo/src/integration-test/kotlin/net/corda/attachmentdemo/AttachmentDemoTest.kt
# samples/irs-demo/src/integration-test/kotlin/net/corda/test/spring/SpringDriver.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/NodeBasedTest.kt
2018-07-04 18:38:34 +01:00
Shams Asari
244167d3e9
Enabled warnings as errors ( #3514 )
2018-07-04 17:17:27 +01:00
Chris Rankin
d634cdcbac
Clear some cut-and-paste cruft out of our Gradle files. ( #3511 )
2018-07-04 15:42:43 +01:00
Chris Rankin
9b5a099302
ENT-2105: Remove unnecessary sourceSets from integration tests. ( #1029 )
...
The database scripts are already available from the test-utils JAR via the classpath and so don't need
to be included as additional source sets.
2018-06-20 15:38:48 +01:00
sollecitom
de0c69a888
Merge remote-tracking branch 'remotes/open/master' into merges/may-29-16-48
...
# Conflicts:
# node/src/integration-test/kotlin/net/corda/node/services/RaftNotaryServiceTests.kt
# node/src/integration-test/kotlin/net/corda/node/services/network/PersistentNetworkMapCacheTest.kt
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# node/src/main/kotlin/net/corda/node/internal/Node.kt
# node/src/main/kotlin/net/corda/node/services/identity/PersistentIdentityService.kt
# node/src/main/kotlin/net/corda/node/services/persistence/DBTransactionMappingStorage.kt
# node/src/main/kotlin/net/corda/node/services/persistence/DBTransactionStorage.kt
# node/src/main/kotlin/net/corda/node/services/vault/NodeVaultService.kt
# node/src/test/kotlin/net/corda/node/internal/NodeTest.kt
# node/src/test/kotlin/net/corda/node/services/identity/PersistentIdentityServiceTests.kt
# node/src/test/kotlin/net/corda/node/services/messaging/ArtemisMessagingTest.kt
# node/src/test/kotlin/net/corda/node/services/persistence/DBCheckpointStorageTests.kt
# node/src/test/kotlin/net/corda/node/services/persistence/DBTransactionStorageTests.kt
# node/src/test/kotlin/net/corda/node/services/persistence/HibernateConfigurationTest.kt
# node/src/test/kotlin/net/corda/node/services/persistence/NodeAttachmentStorageTest.kt
# node/src/test/kotlin/net/corda/node/services/schema/HibernateObserverTests.kt
# node/src/test/kotlin/net/corda/node/services/transactions/PersistentUniquenessProviderTests.kt
# node/src/test/kotlin/net/corda/node/services/transactions/RaftTransactionCommitLogTests.kt
# node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt
# node/src/test/kotlin/net/corda/node/utilities/ObservablesTests.kt
# samples/irs-demo/cordapp/src/test/kotlin/net/corda/irs/api/NodeInterestRatesTest.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
2018-05-29 17:17:08 +01:00
Michele Sollecito
f68cf6f712
[CORDA-1341]: Ensure API can be called concurrently wrt transactions. ( #3235 )
2018-05-29 15:25:34 +01:00
sollecitom
ee45c8280d
Merge remote-tracking branch 'remotes/open/master' into merges/may-21-17-24
...
# Conflicts:
# client/rpc/src/main/kotlin/net/corda/client/rpc/PermissionException.kt
2018-05-22 09:51:02 +01:00
bpaunescu
bff419e9af
Corda-1505 catch connection failure exception and re-throw as RPCException ( #3203 )
...
* CORDA-1505: catch connection failure exception and rethrow as RPCException
* CORDA-1443: remove incorrect import
* CORDA-1443: fix some failing tests
* CORDA-1505: fix broken CordaRPCClient test
* fix tests
* CORDA-1505: catch connection failure exception and rethrow as RPCException
* CORDA-1443: remove incorrect import
* CORDA-1443: fix some failing tests
* CORDA-1505: fix broken CordaRPCClient test
* fix tests
* CORDA-1505: changed exception handling to RPCException
* CORDA-1505: changed exception handling to RPCException
2018-05-21 18:01:31 +01:00
Thomas Schroeter
23a0a66128
Merge remote-tracking branch 'open-source/master' into thomas-merge-3d50e73271cb3bbd95822575349995c9771729dd
2018-05-16 15:30:46 +01:00
Andrzej Cichocki
65b782c206
ENT-933 Add spectator and participant profiles of rigorousMock ( #3157 )
2018-05-16 13:56:41 +01:00
sollecitom
9a69a36904
Merge remote-tracking branch 'remotes/open/master' into merges/may-14-15-21
...
# Conflicts:
# .idea/compiler.xml
# constants.properties
# experimental/behave/src/main/kotlin/net/corda/behave/network/Network.kt
# experimental/behave/src/main/kotlin/net/corda/behave/node/Distribution.kt
# experimental/behave/src/test/kotlin/net/corda/behave/service/PostreSQLServiceTests.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/bridging/AMQPBridgeManager.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/CordaPersistence.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/HibernateConfiguration.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/netty/AMQPChannelHandler.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/netty/AMQPClient.kt
# node/src/integration-test/kotlin/net/corda/node/AuthDBTests.kt
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
# node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt
# node/src/main/kotlin/net/corda/node/services/messaging/MessagingExecutor.kt
# node/src/main/kotlin/net/corda/node/services/persistence/AbstractPartyToX500NameAsStringConverter.kt
# node/src/main/kotlin/net/corda/node/services/persistence/DBTransactionMappingStorage.kt
# node/src/main/kotlin/net/corda/node/utilities/AddOrRemove.kt
# node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
# samples/attachment-demo/src/integration-test/kotlin/net/corda/attachmentdemo/AttachmentDemoTest.kt
# samples/irs-demo/web/src/test/kotlin/net/corda/irs/web/IrsDemoWebApplicationTests.kt
# samples/simm-valuation-demo/src/integration-test/kotlin/net/corda/vega/SimmValuationTest.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/InternalTestUtils.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/RPCDriver.kt
# testing/smoke-test-utils/src/main/kotlin/net/corda/smoketesting/NodeConfig.kt
# webserver/src/integration-test/kotlin/net/corda/webserver/WebserverDriverTests.kt
2018-05-14 15:56:43 +01:00
Michele Sollecito
d027b5b8f2
[CORDA-1472]: Crackdown on warnings. ( #3136 )
2018-05-14 21:15:52 +07:00
Andras Slemmer
ce5fb66260
StateMachine rewrite
2018-04-23 15:36:16 +01:00
Anthony Keenan
2999f0eba2
Merge branch 'ak' into anthony-os-merge-20180406
...
# Conflicts:
# docs/source/api-persistence.rst
2018-04-06 11:01:34 +01:00
Anthony Keenan
ec09188559
[CORDA-1292] Add CordaService testing documentation and improve tests in irs-demo ( #2929 )
...
* Add CordaService testing documentation and improve tests in irs-demo
* Addressed review comments
2018-04-06 09:22:58 +01:00
Viktor Kolomeyko
df6c6b99cd
Merge remote-tracking branch 'open/master' into feature/vkolomeyko/os-merge
...
# Conflicts:
# samples/irs-demo/src/integration-test/kotlin/net/corda/test/spring/SpringDriver.kt
2018-04-06 09:19:34 +01:00
Viktor Kolomeyko
d5317e074c
Remove errorLogPath
parameter which is not used anyway. ( #2934 )
...
StdErr is always written to working directory if such path specified.
2018-04-05 18:10:47 +01:00
Shams Asari
6283462548
Merge remote-tracking branch 'open/master' into shams-os-merge-0af42bd
...
# Conflicts:
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
2018-04-04 14:18:24 +01:00
Joel Dudley
7deb802547
Adds link from changelog to upgrade notes.
2018-04-03 18:03:07 +01:00
Rick Parker
614d2049ec
ENT-1625 Fix overly large footprint of checkpoint bandwidth histogram ( #580 )
...
* Upgrade metrics library and histogram implementation
* Only write to the "per second" checkpoint bandwidth histogram once per second, maximum.
* Bug fix
* Review feedback and fix unit test
* Fix IRS demo to use specific metrics version in spring boot
2018-03-21 09:52:29 +00:00
Andrius Dagys
0d1e9694ae
Merge remote-tracking branch 'open/master' into andrius-merge-1503
2018-03-15 15:07:55 +00:00
Viktor Kolomeyko
64871ac024
Fix IRSSimulationTest
test ( #2821 )
...
* Fix `IRSSimulationTest` test
Since prod class `IRSSimulation` loading `trade.json` as resource, `trade.json` should be located in prod resources folder of a dependant project to be successfully loaded.
Also improve error reporting.
* Change of Json trades samples locations
2018-03-15 14:40:22 +00:00
IgorNitto
0a0c8538c4
Merge from Corda/OS
2018-03-14 17:24:47 +00:00
igor nitto
2cff495553
Remove CordApps JARs from node classpath [CORDA-1135] ( #2691 )
2018-03-14 16:42:23 +00:00
szymonsztuka
b86071c5c5
ENT-1566 Fixes for db integration tests + ENT-1575 db migrations for db attachment changes ( #521 )
...
ENT-1575 Add db migrations for db attachment changes,
ENT-1566 Fixes for db integration tests -following changes in CORDA-926 (obligatory node properties), upgrade db schema setup in draining mode/RPC tests, set runMigration=true in properties files for db tests, add new tables for deletion in SQL setup scrips
Updated db integration tests description in testing.rst
2018-03-09 09:52:44 +00:00
Michele Sollecito
da1afd9c55
Introduced copyright in all source files. ( #519 )
2018-03-06 17:29:21 +00:00
sollecitom
36cd34bff5
Merge remote-tracking branch 'remotes/open/master' into merges/march-1-15-20
...
# Conflicts:
# docs/source/corda-configuration-file.rst
# docs/source/release-notes.rst
# node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
# node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
# tools/demobench/src/test/kotlin/net/corda/demobench/model/NodeConfigTest.kt
# tools/explorer/README.md
# tools/explorer/src/main/kotlin/net/corda/explorer/ExplorerSimulation.kt
2018-03-01 15:36:40 +00:00
Michele Sollecito
b580a2ac30
[CORDA-926]: Parsing NodeConfiguration will now fail if unknown properties are present. ( #2484 )
2018-03-01 14:57:36 +00:00
Anthony Keenan
c72b3ad4fa
Merge remote-tracking branch 'open/master' into anthony-os-merge-2
...
# Conflicts:
# .ci/api-current.txt
# client/jfx/src/integration-test/kotlin/net/corda/client/jfx/NodeMonitorModelTest.kt
# client/rpc/src/integration-test/kotlin/net/corda/client/rpc/FlowsExecutionModeRpcTest.kt
# docs/source/example-code/src/integration-test/kotlin/net/corda/docs/IntegrationTestingTutorial.kt
# docs/source/example-code/src/main/kotlin/net/corda/docs/tutorial/mocknetwork/TutorialMockNetwork.kt
# finance/src/test/kotlin/net/corda/finance/flows/CashPaymentFlowTests.kt
# node/src/integration-test/kotlin/net/corda/node/CordappScanningDriverTest.kt
# node/src/integration-test/kotlin/net/corda/node/NodePerformanceTests.kt
# node/src/integration-test/kotlin/net/corda/node/services/BFTNotaryServiceTests.kt
# node/src/integration-test/kotlin/net/corda/node/services/RaftNotaryServiceTests.kt
# node/src/integration-test/kotlin/net/corda/node/services/network/NetworkMapTest.kt
# node/src/integration-test/kotlin/net/corda/node/services/rpc/RpcSslTest.kt
# node/src/integration-test/kotlin/net/corda/node/services/statemachine/FlowVersioningTest.kt
# node/src/integration-test/kotlin/net/corda/node/services/statemachine/LargeTransactionsTest.kt
# node/src/integration-test/kotlin/net/corda/services/messaging/MQSecurityTest.kt
# node/src/integration-test/kotlin/net/corda/services/messaging/P2PMessagingTest.kt
# node/src/integration-test/kotlin/net/corda/test/node/NodeStatePersistenceTests.kt
# node/src/test/kotlin/net/corda/node/CordaRPCOpsImplTest.kt
# node/src/test/kotlin/net/corda/node/modes/draining/ScheduledFlowsDrainingModeTest.kt
# node/src/test/kotlin/net/corda/node/services/messaging/ArtemisMessagingTest.kt
# node/src/test/kotlin/net/corda/node/services/statemachine/FlowFrameworkTests.kt
# node/src/test/kotlin/net/corda/node/services/transactions/MaxTransactionSizeTests.kt
# samples/trader-demo/src/integration-test/kotlin/net/corda/traderdemo/TraderDemoTest.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/InMemoryMessagingNetwork.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/NodeBasedTest.kt
# verifier/src/integration-test/kotlin/net/corda/verifier/VerifierTests.kt
2018-02-28 16:55:15 +00:00
Anthony Keenan
577033441a
[CORDA-1035] Testing api KDoc Updates ( #2584 )
...
* Testing api KDoc Updates
* Update after code review
* Update api-current
* Revert changes to compiler.xml
* Made comment changes from review
* Fixing merge conflict
* Don't expose net.corda.node through test API (first pass)
* Fixing merge conflicts
* Update api-current
* Addressing review commits
* Fix exposure of internal implementation of MessageHandlerRegistration
* Make InProcess expose ServiceHub instead of internal StartedNodeServices
* Move InternalMockMessaginService interface to internal namespace
* Move MOCK_VERSION_INFO to internal namespace to avoid exposing VersionInfo
* Don't expose WritableTransactionStorage via testing api
* Create public VerifierType enum
* Update api-current and modify check-api-changes to check for net.corda.node exposures
* Fix merge conflicts
* Fixing another merge conflict
* Fix accidentally broken unit tests
* Make getInternalServices a property
* Fix failing unit tests
* Add todo to check-api-changes
* Fix rpc sender thread busy looping
* Fix tests
* Fixing tests
* Address mike's comments
* Fixing tests
* Make random port allocation internal
* Update api
2018-02-28 13:26:49 +00:00
Tommy Lillehagen
a542c0185d
CORDA-1103 - Fix JAR paths in IRS demo launcher
2018-02-28 11:39:31 +00:00
Tommy Lillehagen
3572ce05fa
CORDA-1102 - Fix IRS demo README
2018-02-28 10:03:15 +00:00
Thomas Schroeter
c7e03633c7
Merge remote-tracking branch 'open-source/master' into thomas-merge
2018-02-27 12:01:49 +00:00
Maksymilian Pawlak
b91ef43e0f
Remove the debug helper which should never make it into master ( #2633 )
...
* Remove IRS Docker demo helpers
2018-02-26 15:47:04 +00:00
Andras Slemmer
25263c20c7
Merge remote-tracking branch 'open/master' into aslemmer-merge-19-Feb
2018-02-20 15:52:09 +00:00
Andras Slemmer
6b2b7b6a3c
Merge commit 'fa4b5d16ba6249f85b50851c2f52dc697eebdee6' into aslemmer-merge-19-Feb
2018-02-20 13:26:31 +00:00