ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-28 00:38:55 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #588 from corda/merges/ENT-1634

Browse Source 
Merge OS -> ENT
This commit is contained in:
szymonsztuka 2018-03-21 11:04:40 +00:00 committed by GitHub
commit 785891515e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/main/kotlin/net/corda/core/node/services/vault/QueryCriteria.kt
View File

@ -61,6 +61,13 @@ sealed class QueryCriteria : GenericQueryCriteria<QueryCriteria, IQueryCriteriaP
@CordaSerializable @CordaSerializable
data class TimeCondition(val type: TimeInstantType, val predicate: ColumnPredicate<Instant>) data class TimeCondition(val type: TimeInstantType, val predicate: ColumnPredicate<Instant>)
/**
* Select states based on their locks.
*
* @param [type] Whether to select all locked states, all unlocked states,
* specific locked states, or all unlocked states plus specific locked states.
* @param [lockIds] The specific locked states to select (if applicable).
*/
// DOCSTART VaultQuerySoftLockingCriteria // DOCSTART VaultQuerySoftLockingCriteria
@CordaSerializable @CordaSerializable
data class SoftLockingCondition(val type: SoftLockingType, val lockIds: List<UUID> = emptyList()) data class SoftLockingCondition(val type: SoftLockingType, val lockIds: List<UUID> = emptyList())

4
node/src/main/kotlin/net/corda/node/services/transactions/PersistentUniquenessProvider.kt
View File

@ -51,8 +51,8 @@ class PersistentUniquenessProvider(val clock: Clock) : UniquenessProvider, Singl
@CordaSerializable @CordaSerializable
class Request( class Request(
@Id @Id
@GeneratedValue(strategy = GenerationType.AUTO) @GeneratedValue
val id: Int = 0, val id: Int? = null,
@Column(name = "consuming_transaction_id") @Column(name = "consuming_transaction_id")
val consumingTxHash: String, val consumingTxHash: String,

2
tools/shell/src/integration-test/kotlin/net/corda/tools/shell/SSHServerTest.kt
View File

@ -35,6 +35,7 @@ import net.corda.testing.node.User
import org.assertj.core.api.Assertions.assertThat import org.assertj.core.api.Assertions.assertThat
import org.bouncycastle.util.io.Streams import org.bouncycastle.util.io.Streams
import org.junit.ClassRule import org.junit.ClassRule
import org.junit.Ignore
import org.junit.Test import org.junit.Test
import java.net.ConnectException import java.net.ConnectException
import kotlin.test.assertTrue import kotlin.test.assertTrue
@ -139,6 +140,7 @@ class SSHServerTest : IntegrationTest() {
} }
} }
@Ignore
@Test @Test
fun `ssh runs flows`() { fun `ssh runs flows`() {
val user = User("u", "p", setOf(startFlow<FlowICanRun>())) val user = User("u", "p", setOf(startFlow<FlowICanRun>()))