mirror of
https://github.com/corda/corda.git
synced 2025-02-12 05:35:50 +00:00
de0c69a888
# Conflicts: # node/src/integration-test/kotlin/net/corda/node/services/RaftNotaryServiceTests.kt # node/src/integration-test/kotlin/net/corda/node/services/network/PersistentNetworkMapCacheTest.kt # node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt # node/src/main/kotlin/net/corda/node/internal/Node.kt # node/src/main/kotlin/net/corda/node/services/identity/PersistentIdentityService.kt # node/src/main/kotlin/net/corda/node/services/persistence/DBTransactionMappingStorage.kt # node/src/main/kotlin/net/corda/node/services/persistence/DBTransactionStorage.kt # node/src/main/kotlin/net/corda/node/services/vault/NodeVaultService.kt # node/src/test/kotlin/net/corda/node/internal/NodeTest.kt # node/src/test/kotlin/net/corda/node/services/identity/PersistentIdentityServiceTests.kt # node/src/test/kotlin/net/corda/node/services/messaging/ArtemisMessagingTest.kt # node/src/test/kotlin/net/corda/node/services/persistence/DBCheckpointStorageTests.kt # node/src/test/kotlin/net/corda/node/services/persistence/DBTransactionStorageTests.kt # node/src/test/kotlin/net/corda/node/services/persistence/HibernateConfigurationTest.kt # node/src/test/kotlin/net/corda/node/services/persistence/NodeAttachmentStorageTest.kt # node/src/test/kotlin/net/corda/node/services/schema/HibernateObserverTests.kt # node/src/test/kotlin/net/corda/node/services/transactions/PersistentUniquenessProviderTests.kt # node/src/test/kotlin/net/corda/node/services/transactions/RaftTransactionCommitLogTests.kt # node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt # node/src/test/kotlin/net/corda/node/utilities/ObservablesTests.kt # samples/irs-demo/cordapp/src/test/kotlin/net/corda/irs/api/NodeInterestRatesTest.kt # testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt