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

Merge from Corda master - fix compilation errors

Browse Source
This commit is contained in:
szymonsztuka 2017-10-16 19:08:51 +01:00
parent db0969ebda
commit c436984462
5 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.idea/compiler.xml generated
View File

@ -108,6 +108,9 @@
<module name="sgx-jvm_test" target="1.8" />
<module name="sgx-signtool_main" target="1.8" />
<module name="sgx-signtool_test" target="1.8" />
<module name="signing-server_integrationTest" target="1.8" />
<module name="signing-server_main" target="1.8" />
<module name="signing-server_test" target="1.8" />
<module name="simm-valuation-demo_integrationTest" target="1.8" />
<module name="simm-valuation-demo_main" target="1.8" />
<module name="simm-valuation-demo_test" target="1.8" />

2
README.md
View File

@ -1,6 +1,6 @@
![Corda](https://www.corda.net/wp-content/uploads/2016/11/fg005_corda_b.png)
<a href="https://ci-master.corda.r3cev.com/viewType.html?buildTypeId=CordaEnterprise_CordaBuild&tab=buildTypeStatusDiv"><img src="https://ci.corda.r3cev.com/app/rest/builds/buildType:Corda_CordaBuild/statusIcon"/></a>
<a href="https://ci-master.corda.r3cev.com/viewType.html?buildTypeId=CordaEnterprise_Build&tab=buildTypeStatusDiv"><img src="https://ci.corda.r3cev.com/app/rest/builds/buildType:Corda_CordaBuild/statusIcon"/></a>
# Corda Enterprise

1
node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/Kryo.kt
View File

@ -25,6 +25,7 @@ import net.corda.core.transactions.CoreTransaction
import net.corda.core.transactions.NotaryChangeWireTransaction
import net.corda.core.transactions.SignedTransaction
import net.corda.core.transactions.WireTransaction
import net.corda.core.utilities.SgxSupport
import org.bouncycastle.asn1.ASN1InputStream
import org.bouncycastle.asn1.x500.X500Name
import org.bouncycastle.cert.X509CertificateHolder

6
node/src/main/kotlin/net/corda/node/internal/EnterpriseNode.kt
View File

@ -12,8 +12,8 @@ import org.fusesource.jansi.Ansi
import org.fusesource.jansi.AnsiConsole
import java.io.IOException
class EnterpriseNode(configuration: FullNodeConfiguration, advertisedServices: Set<ServiceInfo>,
versionInfo: VersionInfo) : Node(configuration, advertisedServices, versionInfo) {
class EnterpriseNode(configuration: FullNodeConfiguration,
versionInfo: VersionInfo) : Node(configuration, versionInfo) {
companion object {
private val logger by lazy { loggerFor<EnterpriseNode>() }
}
@ -66,7 +66,7 @@ D""".trimStart()
return tips[(Math.random() * tips.size).toInt()]
}
override fun createNode(conf: FullNodeConfiguration, versionInfo: VersionInfo, services: Set<ServiceInfo>) = EnterpriseNode(conf, services, versionInfo)
override fun createNode(conf: FullNodeConfiguration, versionInfo: VersionInfo) = EnterpriseNode(conf, versionInfo)
private fun connectToRelay(config: RelayConfiguration, localBrokerPort: Int) {
with(config) {

3
tools/explorer/src/main/kotlin/net/corda/explorer/formatters/FlowInitiatorFormatter.kt
View File

@ -10,6 +10,7 @@ object FlowInitiatorFormatter : Formatter<FlowInitiator> {
is FlowInitiator.Shell -> "Shell" // TODO We don't have much information about that user.
is FlowInitiator.Peer -> PartyNameFormatter.short.format(value.party.name)
is FlowInitiator.RPC -> value.username
is FlowInitiator.Service -> value.name
}
}
@ -20,7 +21,7 @@ object FlowInitiatorFormatter : Formatter<FlowInitiator> {
is FlowInitiator.Shell -> Pair(FontAwesomeIcon.TERMINAL, text)
is FlowInitiator.Peer -> Pair(FontAwesomeIcon.GROUP, text)
is FlowInitiator.RPC -> Pair(FontAwesomeIcon.SHARE, text)
is FlowInitiator.Service -> Pair(FontAwesomeIcon.SERVER, text)
}
}
}