Skip to content
This repository has been archived by the owner on Mar 26, 2024. It is now read-only.

Commit

Permalink
chore(OOB): Remove out-of-band (OOB) placeholder code
Browse files Browse the repository at this point in the history 
Signed-off-by: PaulWen <[email protected]>
  • Loading branch information
@PaulWen
PaulWen committed Jan 24, 2023
1 parent a7ace5d commit 67ff616
Show file tree
Hide file tree
Showing 13 changed files with 12 additions and 301 deletions.
4 changes: 0 additions & 4 deletions DEVELOPER_README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,23 +43,19 @@ test-flows:
use-revocable-credentials: true
revocation-registry-size: 500
check-non-revoked: true
use-oob-instead-of-connection: false
issuer-flow:
active: false
use-revocable-credentials: true
revocation-registry-size: 500
use-oob-credential-issuance: false
connection-request-flow:
active: false
credential-issuance-flow:
active: false
use-revocable-credentials: true
revocation-registry-size: 500
use-oob-credential-issuance: false
proof-request-flow:
active: false
check-non-revoked: true
use-oob-proof-requests: false
```

Only one Test Runner and one Test Flow should be set to `active: true` at a time. The Test Flow will **automatically be
Expand Down
118 changes: 1 addition & 117 deletions generator.iml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@
</sourceRoots>
</configuration>
</facet>
<facet type="Spring" name="Spring">
<configuration />
</facet>
<facet type="kotlin-language" name="Kotlin">
<configuration version="4" platform="JVM 11" allPlatforms="JVM [11]" useProjectSettings="false">
<compilerSettings>
Expand Down Expand Up @@ -44,123 +41,10 @@
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_11">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/kotlin" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/kotlin" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.6.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.6.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.6.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.17.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.17.0" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.32" level="project" />
<orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
<orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.29" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.6.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.13.1" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.1" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.13.1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.6.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.56" level="project" />
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.56" level="project" />
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.56" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.14" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.14" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.14" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.14" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.14" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.14" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-kotlin:2.13.1" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.13.1" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.13.1" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.13.1" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-reflect:1.6.10" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.6.10" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains:annotations:13.0" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.6.10" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.10" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.springframework.boot:spring-boot-devtools:2.6.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.6.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.6.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.6.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.6.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.6.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.6.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.4.7" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:2.4.7" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:9.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: jakarta.activation:jakarta.activation-api:1.2.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.21.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest:2.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter:5.8.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.8.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.8.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.1.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-params:5.8.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.8.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.8.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:4.0.0" level="project" />
<orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.11.22" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.11.22" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:3.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-junit-jupiter:4.0.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.14" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.14" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.3.14" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.8.4" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.9.2" level="project" />
<orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.20" level="project" />
<orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.20" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.9.2" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-core:2.9.2" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.9.2" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.9.2" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.9.2" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:20.0" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.9.2" level="project" />
<orderEntry type="library" name="Maven: network.idu.acapy:aries-client-python:0.7.19" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.12.0" level="project" />
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.9" level="project" />
<orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
<orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:4.9.0" level="project" />
<orderEntry type="library" name="Maven: com.squareup.okio:okio:2.8.0" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.6.2" level="project" />
<orderEntry type="library" name="Maven: com.zaxxer:HikariCP:4.0.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.3.14" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.14" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.postgresql:postgresql:42.3.1" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.checkerframework:checker-qual:3.5.0" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.33" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.9" level="project" />
<orderEntry type="library" name="Maven: com.github.loki4j:loki-logback-appender:1.3.1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-actuator:2.6.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator-autoconfigure:2.6.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator:2.6.2" level="project" />
<orderEntry type="library" name="Maven: io.micrometer:micrometer-core:1.8.1" level="project" />
<orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.12" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.latencyutils:LatencyUtils:2.0.3" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: io.micrometer:micrometer-registry-prometheus:1.8.1" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: io.prometheus:simpleclient_common:0.12.0" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: io.prometheus:simpleclient:0.12.0" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: io.prometheus:simpleclient_tracer_otel:0.12.0" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: io.prometheus:simpleclient_tracer_common:0.12.0" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: io.prometheus:simpleclient_tracer_otel_agent:0.12.0" level="project" />
</component>
</module>
4 changes: 0 additions & 4 deletions setup/.env.example
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,24 +57,20 @@ TEST_FLOWS_FULL_FLOW_REVOCATION_REGISTRY_SIZE=3000
TEST_FLOWS_FULL_FLOW_CHECK_NON_REVOKED=false
TEST_FLOWS_FULL_FLOW_REVOKE_CREDENTIALS=false
TEST_FLOWS_FULL_FLOW_CREDENTIAL_REVOCATION_BATCH_SIZE=5
TEST_FLOWS_FULL_FLOW_USE_OOB_INSTEAD_OF_CONNECTION=false

TEST_FLOWS_ISSUER_FLOW_ACTIVE=false
TEST_FLOWS_ISSUER_FLOW_USE_REVOCABLE_CREDENTIALS=true
TEST_FLOWS_ISSUER_FLOW_REVOCATION_REGISTRY_SIZE=3000
TEST_FLOWS_ISSUER_FLOW_USE_OOB_CREDENTIAL_ISSUANCE=false

TEST_FLOWS_CONNECTION_FLOW_ACTIVE=false

TEST_FLOWS_CREDENTIAL_ISSUANCE_FLOW_ACTIVE=false
TEST_FLOWS_CREDENTIAL_ISSUANCE_FLOW_USE_REVOCABLE_CREDENTIALS=true
TEST_FLOWS_CREDENTIAL_ISSUANCE_FLOW_REVOCATION_REGISTRY_SIZE=3000
TEST_FLOWS_CREDENTIAL_ISSUANCE_FLOW_USE_OOB_CREDENTIAL_ISSUANCE=false

TEST_FLOWS_PROOF_REQUEST_FLOW_ACTIVE=false
TEST_FLOWS_PROOF_REQUEST_FLOW_REVOCATION_REGISTRY_SIZE=3000
TEST_FLOWS_PROOF_REQUEST_FLOW_CHECK_NON_REVOKED=true
TEST_FLOWS_PROOF_REQUEST_FLOW_USE_OOB_PROOF_REQUESTS=false

# AcaPy Wallet Type ("indy", "askar", or "basic")
WALLET_TYPE=askar
Expand Down
4 changes: 0 additions & 4 deletions setup/load-generator/load-generator.env
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,15 @@ TESTFLOWS_FULLFLOW_REVOCATIONREGISTRYSIZE=${TEST_FLOWS_FULL_FLOW_REVOCATION_REGI
TESTFLOWS_FULLFLOW_CHECKNONREVOKED=${TEST_FLOWS_FULL_FLOW_CHECK_NON_REVOKED}
TESTFLOWS_FULLFLOW_REVOKECREDENTIALS=${TEST_FLOWS_FULL_FLOW_REVOKE_CREDENTIALS}
TESTFLOWS_FULLFLOW_CREDENTIALREVOCATIONBATCHSIZE=${TEST_FLOWS_FULL_FLOW_CREDENTIAL_REVOCATION_BATCH_SIZE}
TESTFLOWS_FULLFLOW_USEOOBINSTEADOFCONNECTION=${TEST_FLOWS_FULL_FLOW_USE_OOB_INSTEAD_OF_CONNECTION}
TESTFLOWS_ISSUERFLOW_ACTIVE=${TEST_FLOWS_ISSUER_FLOW_ACTIVE}
TESTFLOWS_ISSUERFLOW_USEREVOCABLECREDENTIALS=${TEST_FLOWS_ISSUER_FLOW_USE_REVOCABLE_CREDENTIALS}
TESTFLOWS_ISSUERFLOW_REVOCATIONREGISTRYSIZE=${TEST_FLOWS_ISSUER_FLOW_REVOCATION_REGISTRY_SIZE}
TESTFLOWS_ISSUERFLOW_USEOOBCREDENTIALISSUANCE=${TEST_FLOWS_ISSUER_FLOW_USE_OOB_CREDENTIAL_ISSUANCE}
TESTFLOWS_CONNECTIONFLOW_ACTIVE=${TEST_FLOWS_CONNECTION_FLOW_ACTIVE}
TESTFLOWS_CREDENTIALISSUANCEFLOW_ACTIVE=${TEST_FLOWS_CREDENTIAL_ISSUANCE_FLOW_ACTIVE}
TESTFLOWS_CREDENTIALISSUANCEFLOW_USEREVOCABLECREDENTIALS=${TEST_FLOWS_CREDENTIAL_ISSUANCE_FLOW_USE_REVOCABLE_CREDENTIALS}
TESTFLOWS_CREDENTIALISSUANCEFLOW_REVOCATIONREGISTRYSIZE=${TEST_FLOWS_CREDENTIAL_ISSUANCE_FLOW_REVOCATION_REGISTRY_SIZE}
TESTFLOWS_CREDENTIALISSUANCEFLOW_USEOOBCREDENTIALISSUANCE=${TEST_FLOWS_CREDENTIAL_ISSUANCE_FLOW_USE_OOB_CREDENTIAL_ISSUANCE}
TESTFLOWS_PROOFREQUESTFLOW_ACTIVE=${TEST_FLOWS_PROOF_REQUEST_FLOW_ACTIVE}
TESTFLOWS_PROOFREQUESTFLOW_REVOCATIONREGISTRYSIZE=${TEST_FLOWS_PROOF_REQUEST_FLOW_REVOCATION_REGISTRY_SIZE}
TESTFLOWS_PROOFREQUESTFLOW_CHECKNONREVOKED=${TEST_FLOWS_PROOF_REQUEST_FLOW_CHECK_NON_REVOKED}
TESTFLOWS_PROOFREQUESTFLOW_USEOOBPROOFREQUESTS=${TEST_FLOWS_PROOF_REQUEST_FLOW_USE_OOB_PROOF_REQUESTS}
SERVER_TOMCAT_THREADS_MAX=${SERVER_TOMCAT_THREADS_MAX}
SERVER_TOMCAT_MAXCONNECTIONS=${SERVER_TOMCAT_MAX_CONNECTIONS}
16 changes: 0 additions & 16 deletions src/main/kotlin/com/bka/ssi/generator/agents/acapy/AcaPyAriesClient.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,14 +136,6 @@ class AcaPyAriesClient(
ariesClientLogger.stopPublishRevokedCredentials(trackingId)
}

override fun createOobCredentialOffer(credentialDo: CredentialDo): OobCredentialOfferDo {
throw NotImplementedError("Creating an OOB Credential Offer is not implemented yet.")
}

override fun receiveOobCredentialOffer(oobCredentialOfferDo: OobCredentialOfferDo) {
throw NotImplementedError("Receiving an OOB Credential Offer is not implemented yet.")
}

override fun sendProofRequestToConnection(
connectionId: String,
proofRequestDo: ProofRequestDo,
Expand Down Expand Up @@ -193,12 +185,4 @@ class AcaPyAriesClient(
)
)
}

override fun createOobProofRequest(proofRequestDo: ProofRequestDo, checkNonRevoked: Boolean): OobProofRequestDo {
throw NotImplementedError("Creating an OOB Proof Request is not implemented yet.")
}

override fun receiveOobProofRequest(oobProofRequestDo: OobProofRequestDo) {
throw NotImplementedError("Receiving an OOB Proof Request is not implemented yet.")
}
}
29 changes: 2 additions & 27 deletions src/main/kotlin/com/bka/ssi/generator/application/testflows/CredentialIssuanceFlow.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ class CredentialIssuanceFlow(
@Qualifier("Holder") holderAriesClients: List<IAriesClient>,
@Value("\${test-flows.credential-issuance-flow.use-revocable-credentials}") private val useRevocableCredentials: Boolean,
@Value("\${test-flows.credential-issuance-flow.revocation-registry-size}") private val revocationRegistrySize: Int,
@Value("\${test-flows.credential-issuance-flow.use-oob-credential-issuance}") private val useOobCredentialIssuance: Boolean,
) : TestFlow(holderAriesClients) {

protected companion object {
Expand All @@ -32,7 +31,6 @@ class CredentialIssuanceFlow(
logger.info("Initializing CredentialIssuanceFlow...")
logger.info("use-revocable-credentials: $useRevocableCredentials")
logger.info("revocation-registry-size: $revocationRegistrySize")
logger.info("use-oob-credential-issuance: $useOobCredentialIssuance")

Companion.testRunner = testRunner

Expand All @@ -47,20 +45,11 @@ class CredentialIssuanceFlow(
)
credentialDefinitionId = credentialDefinition.id

if (useOobCredentialIssuance) {
testRunner.finishedInitialization()
} else {
initiateConnection()
}
initiateConnection()
}

override fun startIteration() {
if (useOobCredentialIssuance) {
issueCredentialOob()
} else {
issueCredentialToConnection()
}

issueCredentialToConnection()
logger.info("Sent Credential Offer")
}

Expand All @@ -77,20 +66,6 @@ class CredentialIssuanceFlow(
)
}

private fun issueCredentialOob() {
val oobCredentialOffer = issuerVerifierAriesClient.createOobCredentialOffer(
CredentialDo(
credentialDefinitionId,
mapOf(
"first name" to "Holder",
"last name" to "Mustermann"
)
)
)

nextHolderClient().receiveOobCredentialOffer(oobCredentialOffer)
}

private fun initiateConnection() {
val connectionInvitation = issuerVerifierAriesClient.createConnectionInvitation("holder-acapy")

Expand Down
Loading

0 comments on commit 67ff616

Please sign in to comment.