33ce848e0c
OS-ENT merge
2018-07-16 10:00:16 +01:00
1d91272698
Moved a bunch of tests that were in the integration bucket into unit ( #3576 )
2018-07-13 14:17:56 +01:00
4e81d26985
Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-20180713-1
2018-07-13 13:15:53 +01:00
dc3bd8de7a
Retired BankOfCordaRPCClientTest as it's mostly duplicated by BankOfCordaCordformTest ( #3565 )
2018-07-13 10:37:51 +01:00
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
baabf8ceb9
Merge remote-tracking branch 'open-source/master' into thomas/os-merge-2018-07-11
...
Conflicts:
finance/src/integration-test/kotlin/net/corda/finance/flows/CashConfigDataFlowTest.kt
node/src/integration-test/kotlin/net/corda/node/BootTests.kt
node/src/integration-test/kotlin/net/corda/node/NodeUnloadHandlerTests.kt
node/src/integration-test/kotlin/net/corda/node/flows/FlowRetryTest.kt
tools/shell/src/integration-test/kotlin/net/corda/tools/shell/InteractiveShellIntegrationTest.kt
tools/shell/src/integration-test/kotlin/net/corda/tools/shell/SSHServerTest.kt
webserver/src/integration-test/kotlin/net/corda/webserver/WebserverDriverTests.kt
2018-07-11 14:56:03 +01:00
2833ec2a88
Avoiding starting notaries in driver-based integration tests to speed them up ( #3544 )
2018-07-11 11:36:36 +01:00
852e12a971
Load only packages with schemas neede for this test - fixes issue with unrelated Hibernate entity (org.hibernate.MappingException: Could not determine type for: net.corda.core.schemas.GoodSchemaJavaV1$State, at table: TrickySchemaJavaV1$State ... )
2018-07-06 10:38:59 +01:00
0c8c914882
Removing warnings
2018-07-05 15:45:28 +01:00
d683df5753
CORDA-1711 - Remove dependency on PathUtilsKt in net.corda.core.internal ( #3493 )
2018-07-02 18:32:38 +01:00
374b3d0a41
ENT-2040 - Remove dependency on PathUtilsKt in net.corda.core.internal ( #1141 )
2018-06-29 09:58:46 +01:00
4281061c47
Merge remote-tracking branch 'open/master' into andrius/os-merge-06-27
2018-06-27 10:41:28 +01:00
ad2890193d
Specify Notary in CashIssueAndPaymentFlow and PaymentRequest ( #3443 )
...
* Specify notary in CashIssueAndPaymentFlow
* Specify notary in PaymentRequest
* Address comments
* Default to the first notary in the `CashPaymentFlow`
2018-06-26 16:45:18 +01:00
bf1b3a37ce
Merge remote-tracking branch 'remotes/open/master' into merges/june-19-16-47
2018-06-19 16:48:12 +01:00
d4b982b9fb
ENT-2054: Logging improvements ( #3397 )
2018-06-19 15:29:35 +01:00
b09a57d768
ENT-1943 non clustered primary keys ( #880 )
...
* ENT-1943 Add liquibase change sets to remove clustered indices from primary keys
* ENT-1943 Add liquibase change sets to remove clustered indices from primary keys
* Don't apply non-clustered PK change when using H2
* Move primary key changesets to separate file for core migration files
Use `onValidationFail` rather than precondition to exclude these changes from H2
* Remove/readd foreign key constraint to make SQL server less unhappy
* Fix linear states schema migration
* Fix notary states changelog issues
* Remove v3-GA from master changelog
2018-06-12 15:40:25 +01:00
c3ff42129c
Corda-1297 Column Nullability - dropping index before altering column ( #932 )
...
* Altering column for SQL Server requires dropping index in which it is a part of and the recreating it
(to avoid Liquibase error: The index 'xxx' is dependent on column 'yyy')
* Remove duplicated addNotNullConstraint causing error on Oracle dbs.
2018-06-11 19:21:33 +01:00
98e58b282c
Resolved merge conflicts.
2018-06-11 13:40:38 +01:00
c009cbd91a
[CORDA-1468] Properly handle entites where NULLs can be inserted into DB ( #3324 )
...
* Allow proper null values on entities which fields can get NULL values.
2018-06-11 13:12:19 +01:00
f4621d9a74
[CORDA-1297] Column nullability in migrations ( #916 )
...
* Migrations to proper nullability
* Removed node-core.changelog-v3-GA.xml file as indicated by PR comments, This change was already provided by nullability upgrade commits
2018-06-05 18:13:49 +01:00
63f11d0b54
Upgrade integration test for CORDA-1356 to run in database mode ( #899 )
...
Add SQL setup to run integration test in database mode, add ordering in test because original assumption that rows are returned as inserted doesn't work in Oracle db, ensure distinct names when starting nodes (they can't clash in database mode, as the schema name is taken from node name).
2018-06-04 10:31:56 +01:00
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
e44b6c6f4a
[CORDA-1356]: CashException is unable to derisalize with AMQP through RPC. (fix). ( #3274 )
2018-05-30 17:15:50 +01:00
953b0ca87d
Added copyrights to the test class.
2018-05-30 16:37:46 +01:00
37cadbce69
Resolved merge conflicts.
2018-05-30 16:36:06 +01:00
ed70fea3a7
CORDA-1548 Hibernate session not flushed before handing over raw JDBC session to user code (e.g. coin selection) ( #3266 )
...
* Hibernate session flushed before handing over raw JDBC session to user code + test - inserting and selecting cash in the same transaction
* Additional two tests copied from Enterprise repo
2018-05-30 16:19:06 +01:00
621835aea8
ENT-1990 SQL Server and Oracle coin selection over-select coins ( #891 )
2018-05-30 11:40:38 +01:00
22280ee611
Merge pull request #886 from corda/parkri-os-merge-20180529-1
...
OS -> ENT merge
2018-05-29 16:31:29 +01:00
9c368b1486
ENT-1956 Fix SQL query for cash selection for SQL Server/Azure and Oracle ( #885 )
...
Bug in SQL code for cash selection in Azure/Sql Server/Oracle db was occurring for selection within outputs few outputs from a single transaction and requiring returning a change.
2018-05-29 15:39:30 +01:00
34a9a7aa05
Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-20180529-1
2018-05-29 14:21:53 +01:00
accb9eb5b3
Remove mutex and stop catching deadlock / SQLExceptions. ( #3242 )
...
SQL Exceptions thrown with Cash Selection are now retried via Flow Hospital
2018-05-29 12:15:06 +01:00
c6168cb4e6
Resloved merge conflicts.
2018-05-29 11:32:43 +01:00
78c759e2e6
Resolve compiler warnings for Kotlin >= 1.2.40. ( #3245 )
2018-05-28 18:06:33 +01:00
7d69bc664a
[CORDA-1297] Columns nullability ( #3112 )
...
JPA/Hibernate entities need to impose the correct NULL/NOT NULL constraints on the database - whatever these correct values actually are.
API change: net.corda.core.schemas.PersistentStateRef fields (index and txId) are now non-nullable. Rationale: The fields were always effectively non-nullable - values were set from non-nullable fields of other objects. The class is used in context of database table Primary Key of for other entities and a database already imposes those columns as non-nullable (even if JPA annotation nullable=false was absent).
2018-05-25 19:03:24 +02:00
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
f0db76d854
Re-enabled commented out test and fixed warnings in Finance. ( #3206 )
2018-05-21 17:00:30 +01:00
2ca11d7996
Merge remote-tracking branch 'open/master' into tudor-merge-21-05-18
...
# Conflicts:
# .idea/compiler.xml
# client/rpc/src/main/kotlin/net/corda/client/rpc/CordaRPCClient.kt
# client/rpc/src/main/kotlin/net/corda/client/rpc/internal/CordaRPCClientUtils.kt
# docs/source/generating-a-node.rst
# finance/src/main/kotlin/net/corda/finance/contracts/asset/CommodityContract.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/ArtemisMessagingClient.kt
# node/src/integration-test/kotlin/net/corda/node/amqp/AMQPBridgeTest.kt
# node/src/integration-test/kotlin/net/corda/node/amqp/ProtonWrapperTests.kt
# node/src/integration-test/kotlin/net/corda/node/services/rpc/RpcSslTest.kt
# node/src/main/kotlin/net/corda/node/internal/Node.kt
# node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt
# node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
# node/src/main/kotlin/net/corda/node/services/config/SslOptions.kt
# node/src/main/kotlin/net/corda/node/services/messaging/RPCMessagingClient.kt
# node/src/main/kotlin/net/corda/node/services/rpc/NodeLoginModule.kt
# tools/shell/src/integration-test/kotlin/net/corda/tools/shell/InteractiveShellIntegrationTest.kt
2018-05-21 13:49:59 +01:00
8990e9f783
Merge pull request #3170 from corda/CORDA-1459
...
Corda 1459
2018-05-21 10:45:29 +01:00
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
fa090eb865
CORDA-1506: Cash selection logic fails when selection with a change from more that 2 different issuer groups ( #3187 )
...
* Expose a flaw in cash selection logic
* Minimal test exposing the bug.
* Remaining unspent cash overwrites the cash of the first issuer, not the current issuer - the problem emerged when at least three different groups were selected, for 2 different issuers the last one in selection process was always the first remaining one.
* Addressing PR comments + more precise test name
* Addressing PR comments.
2018-05-18 17:16:41 +01:00
1c49043b36
[CORDA-1459] Typo fix
2018-05-16 17:19:41 +01:00
dc5d89367d
Merge branch 'master' into CORDA-1459
2018-05-16 17:11:23 +01:00
c4be0ad959
[CORDA-1459] Removed CommodityContract
2018-05-16 17:11:12 +01:00
23a0a66128
Merge remote-tracking branch 'open-source/master' into thomas-merge-3d50e73271cb3bbd95822575349995c9771729dd
2018-05-16 15:30:46 +01:00
65b782c206
ENT-933 Add spectator and participant profiles of rigorousMock ( #3157 )
2018-05-16 13:56:41 +01:00
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
d027b5b8f2
[CORDA-1472]: Crackdown on warnings. ( #3136 )
2018-05-14 21:15:52 +07:00
ce7ba2182b
Merge remote-tracking branch 'open/master' into mike-merge-ea81548d6
2018-05-11 16:41:39 +02:00
ea81548d60
[CORDA-1269]: Changed usages of arrayOf() in Entities to use Kotlin 1.2 style. ( #3122 )
2018-05-11 21:07:53 +07:00
590f626433
[ENT-1731]: Record an event of loading and unloading CorDapps. ( #818 )
2018-05-10 22:01:43 +07:00
