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
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
8b3a5432cb
Merge commit '02348a584d56cdb562581d99be5b56348f7d1001' into chrisr3-os-merge
2018-06-23 00:06:11 +01:00
Chris Rankin
02348a584d
CORDA-1639: Resolve ProviderMismatchException when copying a file into a ZIP. ( #3421 )
...
* Resolve ProviderMismatchException when copying a file into a ZIP.
* Review tweaks.
2018-06-22 12:12:31 +01:00
sollecitom
bf1b3a37ce
Merge remote-tracking branch 'remotes/open/master' into merges/june-19-16-47
2018-06-19 16:48:12 +01:00
Viktor Kolomeyko
d4b982b9fb
ENT-2054: Logging improvements ( #3397 )
2018-06-19 15:29:35 +01:00
szymonsztuka
04cb9c9872
Add copyright to source files.
2018-06-08 11:05:29 +01:00
szymonsztuka
e266c8c2a7
Add copyright to source files.
2018-06-08 11:02:16 +01:00
szymonsztuka
d4d459cf22
Merge remote-tracking branch 'remotes/open/master' into merges/os-2018-06-08-szymon
2018-06-08 10:57:50 +01:00
szymonsztuka
baa6479575
ENT-1712 Warning on cross-reference between JPA entities from different mapped schemas ( #3282 )
...
At startup node warns about any MappedSchema containing a JPA entity referencing to another JPA entity from a different MappedSchema. Cross reference between JPA entities across different MappedSchema objects can cause operational issues while evolving one MappedSchema object or migrating it's data. Doc API: Persistence documentation no longer suggests mapping between different schemas.
2018-06-08 10:25:50 +01:00
Shams Asari
7886ef9450
Merge remote-tracking branch 'open/master' into os-merge-21280c0
...
# Conflicts:
# node/src/main/kotlin/net/corda/node/services/statemachine/FlowHospital.kt
# node/src/main/kotlin/net/corda/node/services/statemachine/PropagatingFlowHospital.kt
2018-06-07 18:08:37 +01:00
Shams Asari
f6a23a0216
CORDA-1546: Updated the flow hospital to suspend FinalityHandler if it errors ( #3304 )
...
It will re-run automatically from last checkpoint on node restart, allowing the opportunity to resolve the issue, something required when dealing with contract constraint failures.
2018-06-07 16:18:00 +01:00
tudor.malene@gmail.com
5232c2e0e3
Merge remote-tracking branch 'open/master' into tudor-merge-6-Jun
2018-06-06 13:38:45 +01:00
Andras Slemmer
e2b4943bbb
Observable toposort for transactions ( #3027 )
2018-06-06 13:58:23 +02:00
Shams Asari
03fae9bd7d
Merge branch 'merge-5d1cc0b' into os-merge-5d1cc0b
...
# Conflicts:
# .idea/compiler.xml
# node/src/main/kotlin/net/corda/node/services/statemachine/SingleThreadedStateMachineManager.kt
# node/src/main/kotlin/net/corda/node/services/statemachine/transitions/StateMachine.kt
2018-05-30 21:47:48 +01:00
Shams Asari
7b09795795
CORDA-1383: Cleaned up the JSON format of WireTransaction and SignedTransaction ( #3248 )
...
In particular correctly outputs the custom state and command objects in the txs. Also fixed up deserialisation back into the transaction objects.
2018-05-30 16:37:41 +01:00
Shams Asari
c40e080dcc
Merge remote-tracking branch 'open/master' into os-merge-3136e97
...
# Conflicts:
# .idea/compiler.xml
# node/src/main/kotlin/net/corda/node/serialization/kryo/CordaClassResolver.kt
# node/src/main/kotlin/net/corda/node/serialization/kryo/CordaClosureSerializer.kt
# node/src/main/kotlin/net/corda/node/serialization/kryo/DefaultKryoCustomizer.kt
# node/src/main/kotlin/net/corda/node/serialization/kryo/Kryo.kt
# node/src/main/kotlin/net/corda/node/serialization/kryo/KryoSerializationScheme.kt
# node/src/main/kotlin/net/corda/node/serialization/kryo/SerializeAsTokenSerializer.kt
# node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt
# node/src/test/kotlin/net/corda/node/serialization/kryo/KryoStreamsTest.kt
# node/src/test/kotlin/net/corda/node/serialization/kryo/KryoTests.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/SharedContexts.kt
2018-05-24 13:20:16 +01:00
Shams Asari
3136e973a7
CORDA-1511: Kryo only used for node checkpoints and so moved out of serialization module and into node ( #3228 )
2018-05-24 12:18:07 +01:00
Michele Sollecito
cafcecec2b
[CORDA-1264]: Mask internal errors if devMode is false. ( #871 )
2018-05-23 09:55:24 +01:00
sollecitom
e3b2d3332d
Merge remote-tracking branch 'remotes/open/master' into merges/may-21-17-24
...
# Conflicts:
# constants.properties
# node-api/src/main/kotlin/net/corda/nodeapi/exceptions/RejectedCommandException.kt
# node/src/main/kotlin/net/corda/node/internal/RpcAuthorisationProxy.kt
# node/src/main/kotlin/net/corda/node/internal/SecureCordaRPCOps.kt
2018-05-21 17:29:26 +01:00
Michele Sollecito
f0db76d854
Re-enabled commented out test and fixed warnings in Finance. ( #3206 )
2018-05-21 17:00:30 +01:00
Michele Sollecito
5de2c2aa4b
[CORDA-1264}: Complete obfuscation of exceptions to client side. ( #3155 )
2018-05-21 13:34:37 +01:00
Shams Asari
152848730d
Merge remote-tracking branch 'open/master' into os-merge-2907250
...
# Conflicts:
# build.gradle
# client/rpc/src/main/kotlin/net/corda/client/rpc/CordaRPCClient.kt
# node-api/build.gradle
# node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/amqp/custom/StringBufferSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/AllButBlacklisted.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/AttachmentsClassLoader.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/DefaultWhitelist.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/GeneratedAttachment.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/OrdinalIO.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/SerializationFormat.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/SerializationScheme.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/SerializeAsTokenContextImpl.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/SharedContexts.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/UseCaseAwareness.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/AMQPDescriptorRegistry.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/AMQPPrimitiveSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/AMQPSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/AMQPSerializerFactories.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/ArraySerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/CollectionSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/CorDappCustomSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/CustomSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/DeserializationInput.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/DeserializedGenericArrayType.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/DeserializedParameterizedType.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/EnumEvolutionSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/EnumSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/Envelope.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/EvolutionSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/FingerPrinter.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/MapSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/ObjectSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/PropertySerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/PropertySerializers.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/Schema.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/SerializationHelper.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/SerializationOutput.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/SerializerFactory.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/SingletonSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/SupportedTransforms.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/TransformTypes.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/TransformsSchema.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/BigDecimalSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/BigIntegerSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/BitSetSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/CertPathSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/ClassSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/ContractAttachmentSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/CurrencySerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/DurationSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/EnumSetSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/InputStreamSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/InstantSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/LocalDateSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/LocalDateTimeSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/LocalTimeSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/MonthDaySerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/OffsetDateTimeSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/OffsetTimeSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/OpaqueBytesSubSequenceSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/PeriodSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/PrivateKeySerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/PublicKeySerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/SimpleStringSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/ThrowableSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/X509CRLSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/X509CertificateSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/YearMonthSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/YearSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/ZoneIdSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/ZonedDateTimeSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/carpenter/ClassCarpenter.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/carpenter/Exceptions.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/carpenter/MetaCarpenter.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/carpenter/Schema.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/carpenter/SchemaFields.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/kryo/CordaClassResolver.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/kryo/CordaClosureSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/kryo/DefaultKryoCustomizer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/kryo/Kryo.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/kryo/KryoSerializationScheme.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/kryo/SerializeAsTokenSerializer.kt
# serialization/src/test/java/net/corda/serialization/internal/ForbiddenLambdaSerializationTests.java
# serialization/src/test/java/net/corda/serialization/internal/LambdaCheckpointSerializationTest.java
# serialization/src/test/java/net/corda/serialization/internal/amqp/ErrorMessageTests.java
# serialization/src/test/java/net/corda/serialization/internal/amqp/JavaGenericsTest.java
# serialization/src/test/java/net/corda/serialization/internal/amqp/JavaPrivatePropertyTests.java
# serialization/src/test/java/net/corda/serialization/internal/amqp/JavaSerialiseEnumTests.java
# serialization/src/test/java/net/corda/serialization/internal/amqp/JavaSerializationOutputTests.java
# serialization/src/test/java/net/corda/serialization/internal/amqp/ListsSerializationJavaTest.java
# serialization/src/test/java/net/corda/serialization/internal/amqp/SetterConstructorTests.java
# serialization/src/test/kotlin/net/corda/serialization/internal/AttachmentsClassLoaderTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/ContractAttachmentSerializerTest.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/CordaClassResolverTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/ListsSerializationTest.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/MapsSerializationTest.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/PrivateKeySerializationTest.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/SerializationTokenTest.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/SetsSerializationTest.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/CorDappSerializerTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/DeserializeAndReturnEnvelopeTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/DeserializeMapTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/DeserializeNeedingCarpentryOfEnumsTest.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/DeserializeNeedingCarpentrySimpleTypesTest.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/DeserializeNeedingCarpentryTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/DeserializeSimpleTypesTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/DeserializedParameterizedTypeTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/EnumEvolvabilityTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/EnumEvolveTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/EnumTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/ErrorMessagesTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/EvolutionSerializerGetterTesting.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/EvolvabilityTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/FingerPrinterTesting.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/GenericsTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/OverridePKSerializerTest.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/PrivatePropertyTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/SerializationPropertyOrdering.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/SerializeAndReturnSchemaTest.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/StaticInitialisationOfSerializedObjectTest.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/carpenter/ClassCarpenterTest.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/carpenter/ClassCarpenterTestUtils.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/carpenter/ClassCarpenterWhitelistTest.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/carpenter/CompositeMemberCompositeSchemaToClassCarpenterTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/carpenter/EnumClassTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/carpenter/InheritanceSchemaToClassCarpenterTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/carpenter/MultiMemberCompositeSchemaToClassCarpenterTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/carpenter/SingleMemberCompositeSchemaToClassCarpenterTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/kryo/KryoStreamsTest.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/kryo/KryoTests.kt
# settings.gradle
2018-05-21 10:31:57 +01:00
Rick Parker
6b26d7d1a2
ENT-1476 Upgrade enterprise to de-contended EdDSA lib version ( #843 )
2018-05-21 10:01:06 +01:00
szymonsztuka
013eb33d7c
ENT-1574 Progress tracker distinguishes steps which were not processed ( #3173 )
...
* Progress Tracker doesn't mark as "green tick" a step which hasn't been set in the flow. Steps behind the current step, which were not processed ('an optional step') are now marked distingishly as green crossed sign for shell and as minus sign for ssh.
* Finality Flow sets the current step to NOTARISING only if the actual notarization is performed.
2018-05-18 16:39:55 +01:00
Shams Asari
3cdd908714
Moved the serialisation logic in nodeapi.internal.serialization into its own module: serialization ( #3179 )
...
node-api now depends on this module and upcoming changes will use this as well rather than having to depend on node-api.
EnumEvolveTests.deserializeWithRename and EnumEvolveTests.multiOperations are temporarily ignored since their test resources can't be regenerated due to bugs.
2018-05-17 16:18:07 +01:00
Katelyn Baker
74c5cffd38
Merge remote-tracking branch 'open/master' into kat-merge-20180517
2018-05-17 15:04:51 +01:00
Kat Baker
0c3a30edc8
Corda-847 - Remove Kryo for RPC
...
It's no longer used as we've switched over to AMQP for RPC calls so
remove it from everywhere and only use it for checkpointing
* Wire up demo bench post Kryo removal
* Test Fixes
* rebase and fix tests
* Test Fix
* wip
* revert changes to api now we don't need to add annotations
2018-05-17 12:55:45 +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
Chris Rankin
8d6c54e2d5
Merge commit '781b50642aec9deeeadee219318509e050f9026e' into chrisr3-os-merge
2018-05-09 13:50:46 +01:00
Michele Sollecito
d7ef385cc7
[CORDA-1395] [CORDA-1378]: Control the max number of transaction dependencies. ( #3047 )
2018-05-09 15:58:18 +07:00
Katelyn Baker
406cdf39bb
Merge remote-tracking branch 'open/master' into kat-merge-20180508
2018-05-08 12:10:22 +01:00
Mike Hearn
0784f079ed
Revert "OS merge ( #806 )"
...
This reverts commit 5c0775f7b41561792c2590f6abee4e2d95e430dc.
2018-05-04 16:09:11 +01:00
cburlinchon
5c0775f7b4
OS merge ( #806 )
2018-05-04 15:47:36 +01:00
Katelyn Baker
a61aa5d645
CORDA-847 - Pass serialization context down serialization call stack ( #3062 )
...
* CORDA-847 - Pass serialization context down serialization call stack
Needed for later work on AMQP RPC where we need to set per-thread
elements on a context. Could use some magic thread local but I'd rather
it was explicit on the stack and thus easier to reason about.
Additionally, now we're passing this around we can make better use of it
in the future
* Test Fix
* Test fixes
* REVIEW COMMENTS / CODE FORMAT
* Fix build issues
2018-05-03 16:09:03 +01:00
Thomas Schroeter
61d2212840
Merge remote-tracking branch 'open-source/master' into thomas-merge
...
experimental/behave/src/main/kotlin/net/corda/behave/logging/LogUtilities.kt
node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
node/src/test/kotlin/net/corda/node/services/messaging/ArtemisMessagingTest.kt
2018-04-26 14:47:29 +01:00
Joel Dudley
486441c383
Changes flow tests used in flow testing tutorial to use MockNetwork instead of InternalMockNetwork.
2018-04-25 13:53:22 +01:00
Shams Asari
5f781193b6
Merge remote-tracking branch 'open/master' into os-merge-d3446e2
...
# Conflicts:
# node/src/integration-test/kotlin/net/corda/node/BootTests.kt
# node/src/integration-test/kotlin/net/corda/node/services/AttachmentLoadingTests.kt
# node/src/main/kotlin/net/corda/node/services/statemachine/FlowStateMachineImpl.kt
# testing/smoke-test-utils/src/main/kotlin/net/corda/smoketesting/NodeProcess.kt
# tools/demobench/src/main/kotlin/net/corda/demobench/model/NodeController.kt
2018-04-23 15:50:24 +01:00
Andras Slemmer
ce5fb66260
StateMachine rewrite
2018-04-23 15:36:16 +01:00
Shams Asari
d3446e213c
Introduced a few more extension methods to Path, which are clearer than the static methods in Files. ( #2985 )
...
Also migrated code away from the old File API.
2018-04-23 14:31:49 +01:00
josecoll
15c015e0d6
Merge branch 'master' into colljos-merge-230418
2018-04-23 12:12:16 +01:00
Anthony Keenan
247a97f1a5
Remove superfluous registerInitiatedFlow calls from tutorial and example tests ( #2944 )
2018-04-20 16:56:27 +01:00
Shams Asari
a97abbc8c0
Merge remote-tracking branch 'open/master' into os-merge-1b37cef
2018-04-05 17:23:03 +01:00
Shams Asari
1b37cef822
Minor: use of ByteArray.inputStream() and introduced PublicKey.hash ( #2931 )
2018-04-05 17:18:27 +01:00
Shams Asari
53a0aae489
Introduced a few helper methods around InputStream.readBytes ( #2928 )
2018-04-05 14:27:42 +01:00
sollecitom
ca3ecb97cb
Merge remote-tracking branch 'remotes/open/master' into merges/march-23-11-47
...
# Conflicts:
# node/src/integration-test/kotlin/net/corda/node/NodeStartAndStopTest.kt
# node/src/integration-test/kotlin/net/corda/node/NodeStatePersistenceTests.kt
# node/src/main/kotlin/net/corda/node/services/statemachine/StateMachineManagerImpl.kt
2018-03-23 12:17:00 +00:00
Michele Sollecito
975b81c2c4
[CORDA-1243]: Avoid drain-related deadlocks between 2 nodes. ( #2866 )
2018-03-23 11:45:19 +00:00
