Katelyn Baker
1fda42c2de
Fixing post merge issues with reference states
2018-07-30 11:37:58 +01:00
Katelyn Baker
bb7d33380f
Merge remote-tracking branch 'open/master' into kat-merge-27072018
...
Conflicts:
core/src/main/kotlin/net/corda/core/internal/notary/NotaryServiceFlow.kt
core/src/main/kotlin/net/corda/core/internal/notary/TrustedAuthorityNotaryService.kt
docs/source/blob-inspector.rst
docs/source/release-notes.rst
docs/source/upgrade-notes.rst
node/src/main/kotlin/net/corda/node/services/vault/NodeVaultService.kt
2018-07-27 16:09:26 +01:00
Dominic Fox
f9990ffc4c
Resolve merge conflicts
2018-07-27 10:56:41 +01:00
Dominic Fox
e8eb4c9bf6
Fix merge conflicts
2018-07-25 18:19:07 +01:00
Roger Willis
8207ac3222
CORDA-1332 Reference input states ( #3525 )
...
* * First commit for reference input states feature.
* Added docs.
* Added additional test.
* Fixed whitespace.
* Rebased to master.
* Updated Raft and persistent notary implementations.
* Updated changelog.
* Updated topo sort to handle reference states.
* Stubbed out with referenced states flow.
* Added WithReferencedStatesFlow.
* Added Tests for WithReferencedStatesFlow.
* Added ReferenceState type.
* Rebased to latest version of master.
* Added better comments.
* Updated unit test.
* Added comment to explain a little hack.
* Fixed broken contract upgrade RPC test.
* Added minimum platform version check.
* Updated mock network so that notary nodes inherit the platform version set by the network's minimum platform version.
* References states can now only be used when minimum platform version >= 4.
* Created a new file to hold async operations as "WaitForStatesToUpdate" is broadly reusable.
* Refactored WithReferenceStatesFlow
* Updated javadoc for WaitForStatesToUpdate aysnc operation.
* Added network parameters property to InternalMockNetwork.
* Added min platform version capability to mock services.
* Removed erroneous chars from file.
* Made async operation internal and now call it from FlowLogic.
* Moved some transaction checking code around.
* Removed serializable annotation from referenced state and ref.
* Added reference states design doc.
* Added missing KDocs.
* Updated with reference states flow to handle consecutive update races.
* Made platform version info an inheritable thread local.
* Fixed various typos.
* Updated docs.
* Fixed race.
* Removed min platform version checks as API needs more thought.
* Added deprecation to method and supressed warnings.
* Renamed WaitForStatesToUpdate to WaitForStateConsumption.
* Fixed race in WaitForStateConsumption.
* Addressed PR comments and updated comments / KDocs.
* Reverse vault bugfixes.
* * Vault bug fixes.
* * Fixed broken test.
* Moved WaitForStateConsumption to internal package.
2018-07-25 14:06:56 +01:00
Dominic Fox
f5b86d32f8
Eliminate StartedNode ( #3690 )
...
* Shrink StartedNode
* Eliminate StartedNode
2018-07-25 13:49:34 +01:00
Chris Rankin
1f74d957ff
Merge commit '0b0ad71b3c38c176f85501882de0d4f4c884bfc6' into chrisr3-os-merge
2018-07-25 10:43:57 +01:00
Dominic Fox
6b320026a1
CORDA-916 separate test startednode ( #3675 )
...
* Push start() implementation back into base
* Narrow access
* Optimise imports
* Fix tests
* Get Java test compiling
2018-07-25 10:05:50 +01:00
Chris Rankin
0b0ad71b3c
CORDA-1832: Configure Quasar dependency using quasar-utils plugin. ( #3685 )
2018-07-24 20:19:12 +01:00
Michele Sollecito
a4d65dae22
Merge remote-tracking branch 'remotes/open/master' into merges/july-23-11-26
...
# Conflicts:
# confidential-identities/src/test/kotlin/net/corda/confidential/IdentitySyncFlowTests.kt
# docs/source/changelog.rst
# node/src/integration-test/kotlin/net/corda/node/NodePerformanceTests.kt
# node/src/integration-test/kotlin/net/corda/node/services/AttachmentLoadingTests.kt
# node/src/integration-test/kotlin/net/corda/node/services/BFTNotaryServiceTests.kt
# node/src/integration-test/kotlin/net/corda/node/services/BFTSMaRtTests.kt
# node/src/main/kotlin/net/corda/node/internal/Node.kt
# node/src/main/kotlin/net/corda/node/internal/cordapp/JarScanningCordappLoader.kt
# node/src/main/kotlin/net/corda/node/internal/cordapp/ManifestUtils.kt
# node/src/test/kotlin/net/corda/node/CordaRPCOpsImplTest.kt
# node/src/test/kotlin/net/corda/node/internal/cordapp/JarScanningCordappLoaderTest.kt
# node/src/test/kotlin/net/corda/node/messaging/TwoPartyTradeFlowTests.kt
# node/src/test/kotlin/net/corda/node/services/TimedFlowTests.kt
# settings.gradle
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/DriverDSLImpl.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/NodeBasedTest.kt
2018-07-23 15:22:39 +01:00
Michele Sollecito
abc1d99eaa
[CORDA-1799]: Avoid generating test CorDapp JARs from each out of process node started by the driver ( #3641 )
2018-07-23 11:18:11 +01:00
Dominic Fox
62c2e1c892
OS merge 2018-07-19
2018-07-19 16:43:46 +01:00
Dominic Fox
7a18dbb8ed
Merge pull request #3644 from corda/flow-test-rationalisation
...
Flow test rationalisation
2018-07-19 15:33:43 +01:00
Dominic Fox
d1455b7a0e
Move hamkrest version number into top-level configuration
2018-07-19 14:21:07 +01:00
Dominic Fox
f3d9750ea5
Eliminate needless equalTo
2018-07-19 13:47:18 +01:00
Dominic Fox
c0966067cc
Move andRunNetwork out of transaction block
2018-07-19 12:02:46 +01:00
Dominic Fox
974db3a15b
Rename matcher
2018-07-19 12:00:02 +01:00
Dominic Fox
2992866269
Eliminate unnecessary transactions
2018-07-19 11:45:42 +01:00
Dominic Fox
fc5cc89fdb
Renaming matchers
2018-07-19 11:36:07 +01:00
Dominic Fox
0780d6051e
Use startFlowAndRunNetwork
2018-07-18 15:21:04 +01:00
Dominic Fox
201628e44f
Extract common test functionality into mixin interfaces
2018-07-18 13:49:49 +01:00
Michal Kit
c0207b2219
CORDA-1815 adding maxTransactionSize validation ( #3635 )
...
* CORDA-1815 adding maxTransactionSize validation
* Fixing failing tests
* Fixing failing test
2018-07-18 10:34:41 +01:00
Chris Rankin
aa50aaf95d
Merge commit 'e879de7' into chrisr3-os-merge
2018-07-17 22:47:24 +01:00
Dominic Fox
45514a8764
Minor tidying
2018-07-17 17:19:58 +01:00
Dominic Fox
e16056eb36
Refactor to new style, sharing mock network
2018-07-17 17:12:20 +01:00
Dominic Fox
73d3af504d
Merge pull request #3615 from corda/df-reuse-mock-network-example
...
Reuse mock network, randomising party names to avoid clash
2018-07-17 17:10:33 +01:00
Dominic Fox
851d1fa557
Clarify test intention with generators, operations and matchers
2018-07-16 17:51:20 +01:00
Florian Friemel
1ca2059863
[CORDA-1635] Update docs (node naming constraints). ( #3595 )
...
* Update docs (node naming constraints).
* Update CordaX500NameTest to ensure consistency with the docs.
* Respond to feedback.
2018-07-16 17:29:29 +01:00
Chris Rankin
d262c88c0b
CORDA-1814: Quasar is only providing its annotations (i.e. @Suspendable) so remove its transitive dependencies. ( #3620 )
2018-07-16 15:57:11 +01:00
Patrick Kuo
52d281b66f
Merge pull request #1261 from corda/pat/crl-check-cherry-pick
...
CRL url checks and warning for mis-configurated CRL endpoint (#1258 )
2018-07-16 11:43:21 +01:00
Dominic Fox
aac4d64b64
Reuse mock network, randomising party names to avoid clash
2018-07-16 10:52:26 +01:00
rick.parker
21a7b56161
Fix up compilation errors.
2018-07-13 14:33:13 +01:00
rick.parker
4e81d26985
Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-20180713-1
2018-07-13 13:15:53 +01:00
Andras Slemmer
80a5e7ab81
Add flow state machine extension tutorial
2018-07-12 15:30:23 +01:00
Chris Rankin
7f42a9b48c
ENT-1565: Remove Guava code from core. ( #3569 )
...
Remove Guava code from core.
Note that forcing this project to use Guava `$guava_version` throughout breaks SimmValuationTest.
2018-07-12 14:52:44 +01:00
Katarzyna Streich
b275f4349a
ENT-1968: Add RPC for refreshing network map cache ( #3552 )
...
ENT-1968: Add RPC for refreshing network map cache
2018-07-12 13:40:33 +01:00
Shams Asari
f4a248f81f
Made CashSelectionTest a unit test by using mock network. ( #3570 )
...
Also includes adding a default value of emptyList() to InternalMockNetwork.cordappPackages
2018-07-12 11:55:51 +01:00
Rick Parker
a23b3f4b29
ENT-933 Prioritise flow completion. Executor prioritises flows created first. ( #1255 )
...
* ENT-933 Prioritise flow completion. Executor prioritises flows created first.
* Unit tests
* More unit tests
* Formatting
2018-07-12 08:30:02 +01:00
Stefano Franz
9503c9684e
CORDA-1747 - Client RPC classloader and Java Generics fixes ( #3553 )
...
* fix for spring boot rpc and it work with deterministic serialization
* really really fix tests
* up log level
* reenable allWarningsAsErrors
2018-07-11 13:28:01 +01:00
Patrick Kuo
389c0d0ffa
CRL url checks and warning for mis-configurated CRL endpoint ( #1258 )
...
(cherry picked from commit 7ef0703)
2018-07-11 11:49:59 +01:00
Stefano Franz
480698bc46
Merge remote-tracking branch 'open/master' into my-merge-july-11-11-27
...
# Conflicts:
# CONTRIBUTORS.md
2018-07-11 11:37:49 +01:00
Katelyn Baker
fa55221b66
fix for spring boot rpc and it work with deterministic serialization
2018-07-11 10:59:21 +01:00
Anthony Keenan
8d7aa5f590
Merge remote-tracking branch 'open/master' into anthony-os-merge-20180710
...
# Conflicts:
# .idea/compiler.xml
# docs/source/changelog.rst
# docs/source/network-bootstrapper.rst
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# node/src/main/kotlin/net/corda/node/services/identity/IdentityServiceUtil.kt
# node/src/main/kotlin/net/corda/node/services/identity/PersistentIdentityService.kt
2018-07-10 11:19:23 +01:00
Dan Newton
7b4ace16e1
Remove duplicated code between PersistentIdentityService and InMemoryIdentityService ( #3428 )
2018-07-10 08:35:14 +01:00
Michele Sollecito
54161a630a
[CORDA-1659]: Improve handling/logging of failed address binding. ( #3498 )
2018-07-09 18:45:20 +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
Michal Kit
408cc68c65
CORDA-1715 Ordering the X500 name for the CRL extension of the TLS certificates ( #3515 )
...
* CORDA-1715 Ordering the X500 name for the CRL extension of the TLS certificate
* Addressing review comments
* Addressing review comments - round 2
* Throwing an exception on incorrect TLS CRL issuer configuration
* Changes after the redesign decisions
* Small refactoring
2018-07-09 13:45:38 +01:00
Anthony Keenan
3203bdae97
Merge from O/S
2018-07-05 19:09:25 +01:00
Chris Rankin
5106b01832
CORDA-1699: Restore binary compatibility for UniqueIdentifier class. ( #3505 )
...
* Update JarFilter to remove certain annotations from primary constructors.
* Enhance unit tests for deleting constructors.
* Update the documentation to explain how to handle non-deterministic default
constructor parameters.
* Reduce the base logging level of SanitisingTransformer to DEBUG.
* Simplify the execution of repeatable ClassVisitors.
* Simplify Gradle usage slightly.
* Add test for deterministic UniqueIdentifier.
* Update README to cover handling default parameters.
2018-07-05 16:14:56 +01:00
Shams Asari
0c8c914882
Removing warnings
2018-07-05 15:45:28 +01:00