Shams Asari
98cd8be160
Merge remote-tracking branch 'open/master' into os-merge-b97af47
...
# Conflicts:
# .idea/compiler.xml
# docs/source/changelog.rst
# docs/source/release-notes.rst
# node/src/main/kotlin/net/corda/node/internal/cordapp/CordappLoader.kt
# tools/bootstrapper/build.gradle
2018-06-25 11:38:30 +01:00
Shams Asari
3046843d40
CORDA-1602: Added cmd line flags to the network bootstrapper ( #3419 )
...
The list of CorDapps jars is no longer passed in via the cmd line but is now expected to be placed in the bootstrapped directory.
Ended up being a bit of a refactor to cater for unit testing, and also tidied up the bootstrapper docs.
2018-06-23 11:36:10 +01:00
Tommy Lillehagen
a612ca234a
Merge remote-tracking branch 'open/master' into tlil-os-merge-20180613
2018-06-13 21:45:00 +01:00
Tommy Lillehagen
fe313951ea
CORDA-1609 - Don't use reserved keyword as method name
...
As reported in [CORDA-1609](https://r3-cev.atlassian.net/browse/CORDA-1609 ),
`CordaRPCClientConfiguration.default` is not accessible from Java since
`default` is a reserved keyword.
As part of the refactor made in #2831 , `CordaRPCClientConfiguration` went
from being a data class to an interface with a backing implementation of
type `CordaRPCClientConfigurationImpl`.
This resulted in Java users having to rewrite code that was on the form:
```java
final CordaRPCClient client = new CordaRPCClient(
nodeAddress, CordaRPCClientConfiguration.DEFAULT
);
```
to something like this:
```java
final CordaRPCClient client = new CordaRPCClient(
nodeAddress, CordaRPCClientConfiguration.Companion.default()
);
```
However, this does not work. The user would get a compilation error because
`default` is a reserved keyword in Java.
Since `CordaRPCClientConfiguration` has been made an interface, there is no
easy way of introducing a static final field on the interface from Kotlin.
Consequently, I've changed this back to using a `class` with a static field
named `DEFAULT` instead of the static method `default()`.
It should be noted that `default()` / `DEFAULT` is currently only used
internally to pass in default values in `CordaRPCClient.kt` and
`CordaRPCClientUtils.kt`. That said, it is exposed as part of our API
surface and consequently shouldn't be broken.
The latter means that in the above example, the user would actually not
have to provide the parameter at all:
```java
final CordaRPCClient client = new CordaRPCClient(nodeAddress);
```
As can be seen from the definition of `CordaRPCClient`:
```kotlin
class CordaRPCClient private constructor(...) {
@JvmOverloads
constructor(
hostAndPort: NetworkHostAndPort,
configuration: CordaRPCClientConfiguration = CordaRPCClientConfiguration.DEFAULT
) : this(hostAndPort, configuration, null)
```
The mentioned [refactor](7a077e76f0 (diff-0948c125db93a22263eb81eaf3161c17R65)
2018-06-13 15:39:03 +01:00
Viktor Kolomeyko
1011e45b84
ENT-1962: Perform RPC retry in case of RejectedCommandException ( #982 )
...
* ENT-1962: Perform RPC retry in case of RejectedCommandException
(cherry picked from commit 2a7f0dd)
* ENT-1962: Address code-review comments.
(cherry picked from commit 7b4edde)
2018-06-13 12:33:36 +01:00
Tudor Malene
cb50e58367
CORDA-1558 Rename database migration to database management ( #979 )
...
* CORDA-1558 Rename database migration to database management
* CORDA-1558 Address code review comments
* CORDA-1558 Address code review comments
* CORDA-1558 Address code review comments
2018-06-13 10:52:00 +01:00
Shams Asari
f34a2bd33f
Replacing uses of assert with require
2018-06-06 09:56:04 +01:00
Shams Asari
11fd70a1f7
Merge remote-tracking branch 'open/master' into os-merge-d620e71
...
# Conflicts:
# node/src/main/kotlin/net/corda/node/serialization/kryo/Kryo.kt
2018-06-06 09:51:29 +01:00
Shams Asari
d620e71bb6
Replaced all uses of assert with require ( #3309 )
...
JVM assertions have to be enabled with the -ea flag so it's possible for these checks to be ignored.
2018-06-06 00:31:41 +01:00
josecoll
c2f22e18a5
Corda Behave framework updates to decouple from Network Services ( #914 )
...
* Added new 'eventHorizonDays' configuration item.
* Added custom authenticator to provide ARTIFACTORY credentials upon resolving protected internal URL.
* Re-pointed functional test scenarios to point to Enterprise master.
* Enterprise corda network scenarios to use NetworkBootstrapper tool (instead of Doorman/NMS) since decision made by Product Management to split out Doorman/NMS from Enterprise.
* Configuration parameter changed to 'runMigration' since DP3.
* Fixed problem with logger upon startup.
* General improvements and additions to setup and execution scripts (eg. SIMM valuation demo now consists of 3 separate jars)
* Updates to decouple from Network Services.
* Download all JARs from artifactory for a given published distribution.
* Add TODOs for Doorman/NMS rework.
* Addressing TL PR review comments.
* Additional instructions for setting up the environment and running QA tests.
* Fixed repository URL references.
2018-06-05 15:02:07 +01:00
szymonsztuka
f5c9a398ad
Merge remote-tracking branch 'remotes/open/master' into merges/os-2018-06-04-szymon
...
# Conflicts:
# docs/source/upgrade-notes.rst
# node/src/integration-test/kotlin/net/corda/node/BootTests.kt
2018-06-04 17:35:19 +01:00
Thomas Schroeter
141d45c39d
Add simulation of the avalanche consensus protocol to experimental ( #3283 )
2018-06-04 13:33:34 +01:00
josecoll
76644e0d00
ENT-1871 Rebrand R3Corda to Corda Enterprise ( #907 )
...
* Final part of rebranding exercise.
* Fix test.
2018-06-02 10:47:31 +01:00
Viktor Kolomeyko
63d357f62b
ENT-1986: Extend node HA test scenario to support LinearState. ( #893 )
...
* ENT-1986: Introduce new parameter `scenarioType`
* ENT-1986: Introduce `AbstractScenarioRunner` and refactor all the reusable bit of functionality into this class.
* ENT-1986: Create `LinearStateScenarioRunner` to use `perftestcordapp` flows.
* ENT-1986: More improvements to make Linear scenario runner work.
2018-05-31 11:14:59 +01:00
Tudor Malene
fd2f2eb14a
ENT-1871 Rebrand R3Corda to Corda Enterprise ( #838 )
...
* ENT-1871 Rebrand R3Corda to Corda Enterprise
* ENT-1871 Address code review comments
* ENT-1871 Address code review comments
* ENT-1871 Address code review comments
* ENT-1871 Address code review comments
2018-05-31 08:59:05 +01:00
Viktor Kolomeyko
43ddc5e179
ENT-1396: Improve verification of states to transactions. ( #882 )
...
Since not every output state may be present, e.g. if the whole amount been paid and at source
the state is fully spent, there will not be a trace of an output state at source.
But recipient(target) will always have references of output states in its vault.
Also perform transfer of the full issued amount to eliminate any sort of coin selection issues.
2018-05-30 15:35:28 +01:00
rick.parker
033a5798a1
Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-20180525-1
...
# Conflicts:
# .idea/compiler.xml
# node-api/src/main/kotlin/net/corda/nodeapi/internal/config/ConfigUtilities.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/DatabaseTransaction.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/services/network/NetworkMapTest.kt
# node/src/main/kotlin/net/corda/node/services/messaging/P2PMessagingClient.kt
# node/src/main/kotlin/net/corda/node/services/statemachine/transitions/DeliverSessionMessageTransition.kt
# node/src/main/resources/reference.conf
# node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
# node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt
# settings.gradle
2018-05-25 14:19:15 +01:00
Shams Asari
4e0378de9c
CORDA-1238: Moved the blob inspector out of experimental and wired it to JackonSupport ( #3224 )
...
The existing output format was not complete and so was deleted to avoid it becoming a tech debt. We can always resurrect it at a later point.
2018-05-24 18:26:55 +01:00
Shams Asari
77ef131c0f
Merge pull request #876 from corda/os-merge-3136e97
...
O/S merge from 3136e97
2018-05-24 16:53:03 +01:00
Viktor Kolomeyko
ee094ef129
ENT-1396: Further improvements to Node HA Testing script. ( #873 )
...
* CORDA-1506: Cherry-pick fix from Corda OS.
* ENT-1396: Add verification logic to ensure that transaction reflected on both sides.
* ENT-1396: First stub on HA re-connect logic.
* ENT-1396: Ensure we re-connect correctly.
* ENT-1396: Improve the robustness of the scenario runner.
* ENT-1396: Perform Vault query in re-tryable fashion.
* ENT-1396: Larger iterations count.
* ENT-1396: Introduce "iterationsCount" as parameter.
* ENT-1396: ReadMe document.
2018-05-24 14:31:38 +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
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
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
Viktor Kolomeyko
9ec7e7f4c8
ENT-1396: First stub on Node HA testing facility. ( #856 )
...
* ENT-1396: Skeleton of HA testing project
* ENT-1396: Tidy-up arguments parsing and introduce ScenarioRunner.
* ENT-1396: More changes for ScenarioRunner.
* ENT-1396: Further changes.
* ENT-1396: Further changes.
* ENT-1396: Improve logging.
* ENT-1396: Add TODO comments to indicate what is going to be done in the future.
2018-05-21 09:36:14 +01:00
Tomas Tauber
3a9fa50799
Added the additional Corda utility code with FSM-like transition contract checking
2018-05-21 10:28:27 +02: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
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
Katarzyna Streich
509a52ad5e
CORDA-866: Implement removal of stale nodes from network ( #774 )
...
* Implement removal of stale nodes from network
Add eventHorizon to NetworkParameters structure. Add republishing of
node info on 1 day intervals - it is treated by network map as heartbeat from node indicating if it's alive or not. Add removal of old node infos on network map signing.
* Add copy method to NetworkParameters data class
Add JvmOverloads annotation to the constructor, because it's data class
exposed in API
2018-05-11 17:11:56 +01:00
josecoll
4afc7f3824
Behave: fix compilation problem in IntelliJ ( #830 )
...
* Sprinkled new gradle dust to make both IntelliJ and TC (gradle) compilation happy.
* Fix compilation problem once and for all + ignore the RPCProxyWebServiceTest smoke test.
2018-05-11 15:21:42 +01:00
Michele Sollecito
590f626433
[ENT-1731]: Record an event of loading and unloading CorDapps. ( #818 )
2018-05-10 22:01:43 +07:00
josecoll
32011e05d1
Add missing logger. ( #817 )
...
* Add missing logger.
* Ensure scenario code is compiled as part of the standard gradle build task.
2018-05-10 14:42:30 +01:00
Michele Sollecito
1963c29f01
Merge branch 'master' into kat-merge-20180508
2018-05-08 21:52:24 +07:00
josecoll
28644b6514
Merge pull request #751 from corda/colljos-compatibility-testing
...
ENT-1834: Corda Behave extensions for CTS
2018-05-08 15:42:11 +01: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
Katelyn Baker
20570d72cf
CORDA-1238 - Move blob inspector initial work into experimental ( #3058 )
...
* CORDA-1238 - Initial blob inspector tool commit
Note this is WIP and not ready for prime time but it's time it moved off
of a personal branch and into the main code base, especially if I'm
passing the serialization code onto someone else's shoulders
* CORDA-1238 - Move blob inspector into experimental
It was developed locally in tools (as it's a tool), but it's no
where near production ready, so lets just ship it in experimental
for now
* CORDA-1238 - Tidyup and bug fixes
2018-05-03 13:25:29 +01:00
josecoll
6c4da2a3a0
Added Java properties to configure location of Node configuration directories and JDBC driver jar.
2018-05-02 17:59:28 +01:00
josecoll
3f0f603ded
Final clean-up.
2018-05-02 15:52:35 +01:00
josecoll
8f47fe8c68
Extensions to Corda Behave for CTS.
...
Minor fixes following integration and regression testing with CordaRPCProxy
Remove unrelated code.
Address remaining PR review comments.
2018-05-02 12:31:22 +01:00
szymonsztuka
b25892e45b
resolved conflicts
2018-05-01 21:32:11 +01:00
josecoll
6b78ee8c14
Fix incorrect imports. ( #3022 )
2018-04-27 11:52:51 +01:00
sollecitom
70b32636b5
Merge remote-tracking branch 'remotes/open/master' into merges/april-27-09-38
...
# Conflicts:
# docs/source/changelog.rst
# node-api/src/main/kotlin/net/corda/nodeapi/internal/config/ConfigUtilities.kt
# node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
2018-04-27 10:12:15 +01:00
josecoll
b208d03f5c
Corda Behave: compendium of minor changes and improvements ( #3008 )
...
* Compendium of minor changes and improvements:
- build fat behave-jar so can run scenarios from shell scripts (from TC)
- additional run script to execute basic scenarios (for TC)
- default staging path shortened to "corda" (removed deps)
- toned down logging (info -> debug)
- fixed all compiler warnings
- fixed couple of bugs in startup checking steps
- base scenarios use variables declared using Examples parameterization
* Added missing braces
* Changes to address PR feedback.
* Mark underlying Cucumber libraries for future de-coupling.
2018-04-26 16:13:34 +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
josecoll
5dc71fc350
Behave: use existing Core common utility functions for Logger creation and Ti… ( #2990 )
...
* Use existing Core common utility functions for Logger creation and Time durations.
* Updated JUnit tests.
2018-04-26 13:40:37 +01:00
