Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SDFSOF-123: End2End tests for SEP-31 and sync with develop #1076

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
1f61ddc
SDFSOF-142: Rename RPC action to RPC request/method (#13)
rkharevych Aug 21, 2023
a6f93c7
Merge branch 'fireblocks_integration' of github.com:rkharevych/java-s…
rkharevych Aug 23, 2023
a60a603
SDFSOF-141: Observer: the status of sep31 transaction is not updated …
rkharevych Aug 23, 2023
719886f
Update gradle action to increase allocated memory
rkharevych Aug 23, 2023
68b877d
Merge branch 'fireblocks_integration' of github.com:rkharevych/java-s…
rkharevych Aug 23, 2023
4ad05b1
Validate deposit info generator type (#18)
rkharevych Aug 30, 2023
be7140a
Merge branch 'develop' of github.com:rkharevych/java-stellar-anchor-s…
rkharevych Aug 30, 2023
cbe55fa
SDFSOF-123: End2End tests for SEP-31 (#19)
rkharevych Aug 31, 2023
9e1da6f
Merge branch 'softserve-develop' of github.com:rkharevych/java-stella…
rkharevych Aug 31, 2023
6150431
Run code check
rkharevych Aug 31, 2023
df5c097
Merge branch 'softserve-develop' of github.com:rkharevych/java-stella…
rkharevych Aug 31, 2023
924e9f3
Refactoring
rkharevych Sep 4, 2023
da76885
Merge branch 'develop' of github.com:rkharevych/java-stellar-anchor-s…
rkharevych Sep 6, 2023
b384b8a
Fix E2E tests
MazurakIhor Sep 6, 2023
e1eaeea
Fix E2E tests
MazurakIhor Sep 6, 2023
5cdbb2a
Fix E2E tests
MazurakIhor Sep 6, 2023
a895f63
Remove logs
MazurakIhor Sep 6, 2023
2d08c48
Merge pull request #22 from rkharevych/fireblocks_integration_tests
MazurakIhor Sep 6, 2023
288aaf9
Merge branch 'softserve-develop' of https://github.com/stellar/java-s…
MazurakIhor Sep 7, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .run/Run - All Servers - no Docker.run.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Run - All Servers - no Docker" type="JetRunConfigurationType">
<envs>
<env name="sep24.enableTest" value="true" />
<env name="app.enableTest" value="true" />
</envs>
<option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.run_profiles.RunAllServers" />
<module name="java-stellar-anchor-sdk.service-runner.main" />
Expand Down
2 changes: 1 addition & 1 deletion .run/Run - Kotlin Reference Server - no Docker.run.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Run - Kotlin Reference Server - no Docker" type="JetRunConfigurationType">
<envs>
<env name="sep24.enableTest" value="true" />
<env name="app.enableTest" value="true" />
<env name="TEST_PROFILE_NAME" value="default" />
</envs>
<option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.run_profiles.RunKotlinReferenceServer" />
Expand Down
15 changes: 13 additions & 2 deletions docs/01 - Contributing/A - Development Environment.md
Original file line number Diff line number Diff line change
Expand Up @@ -164,16 +164,27 @@ Several IntelliJ run configurations are provided to make it easier to run the pr
- `Run - Platform Server - no Docker`: runs the Platform server locally, without running `docker-compose`.
- `Run - Event Processing Server - no Docker`: runs the Event Processing server locally, without
running `docker-compose`.
- `Run - Custody Server - no Docker`: runs the Custody server locally, without running `docker-compose`.
- `Run - Java Reference Server - no Docker`: runs the Java Reference server locally, without running `docker-compose`.
- `Run - Kotlin Reference Server - no Docker`: runs the Kotlin Reference server locally, without
running `docker-compose`.

The following run configurations are provided to run integration and end-2-end tests

- `Test - Kotlin Reference Server - no Docker`: runs the Kotlin Reference server locally, without
running `docker-compose`.
- `Test - End2End Test - no fullstack`: runs the end-2-end tests locally, without running `docker-compose`.
- `Test - End2End Test - with fullstack`: runs the end-2-end tests locally, with running `docker-compose`.
- `Test - End2End with RPC Test - no fullstack`: runs the end-2-end tests with RPC locally,
without running `docker-compose`.
- `Test - End2End with RPC Test - with fullstack`: runs the end-2-end tests with RPC locally,
with running `docker-compose`.
- `Test - Fireblocks End2End Test - no fullstack`: runs the end-2-end tests with Fireblocks locally,
without running `docker-compose`.
- `Test - Fireblocks End2End Test - with fullstack`: runs the end-2-end tests with Fireblocks locally,
with running `docker-compose`.
- `Test - Fireblocks End2End with RPC Test - no fullstack`: runs the end-2-end tests with Fireblocks and RPC locally,
without running `docker-compose`.
- `Test - Fireblocks End2End with RPC Test - with fullstack`: runs the end-2-end tests with Fireblocks and RPC locally,
with running `docker-compose`.
- `Test - Integration Test - no fullstack`: runs the integration tests locally, without running `docker-compose`.
- `Test - Integration Test - with fullstack`: runs the integration tests locally, with running `docker-compose`.

Expand Down
2 changes: 1 addition & 1 deletion docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ contribute to this project.
infrastructures, such as database, configuration, queue, or logging implementations are assumed in this sub-project.
- __platform__: Contains the Anchor Platform implementation that uses Spring Boot as the underlying framework. This
sub-project is responsible for providing the infrastructure implementations, such as database, configuration, queue,
and logging. The `sep-server`, `platform-server`, `event-processor` and `stellar-observer` services are also implemented here.
and logging. The `sep-server`, `platform-server`, `custody-server`, `event-processor` and `stellar-observer` services are also implemented here.
- __kotlin_reference_server__: Contains the anchor's reference server implementation in Kotlin.
- __anchor_reference_server__: Contains the anchor's reference server implementation in Java. This will be deprecated soon.
- __wallet_reference_server__: Contains the wallet's reference server implementation in Kotlin.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ open class AbstractIntegrationTest(private val config: TestConfig) {
lateinit var sep24RpcE2eTests: Sep24RpcEnd2EndTests
lateinit var sep24CustodyE2eTests: Sep24CustodyEnd2EndTests
lateinit var sep24CustodyRpcE2eTests: Sep24CustodyRpcEnd2EndTests
lateinit var sep31RpcE2eTests: Sep31RpcEnd2EndTests
lateinit var sep31CustodyRpcE2eTests: Sep31CustodyRpcEnd2EndTests

fun setUp(envMap: Map<String, String>) {
envMap.forEach { (key, value) -> config.env[key] = value }
Expand Down Expand Up @@ -74,6 +76,8 @@ open class AbstractIntegrationTest(private val config: TestConfig) {
sep24CustodyE2eTests = Sep24CustodyEnd2EndTests(config, jwt)
sep24RpcE2eTests = Sep24RpcEnd2EndTests(config, jwt)
sep24CustodyRpcE2eTests = Sep24CustodyRpcEnd2EndTests(config, jwt)
sep31RpcE2eTests = Sep31RpcEnd2EndTests(config, toml, jwt)
sep31CustodyRpcE2eTests = Sep31CustodyRpcEnd2EndTests(config, toml, jwt)
eventProcessingServerTests = EventProcessingServerTests(config, toml, jwt)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class AnchorPlatformApiRpcEnd2EndTest :
@BeforeAll
@JvmStatic
fun construct() {
println("Running AnchorPlatformActionsEnd2EndTest")
println("Running AnchorPlatformApiRpcEnd2EndTest")
singleton.setUp(mapOf())
}

Expand All @@ -28,4 +28,10 @@ class AnchorPlatformApiRpcEnd2EndTest :
fun runSep24Test() {
singleton.sep24RpcE2eTests.testAll()
}

@Test
@Order(11)
fun runSep31Test() {
singleton.sep31RpcE2eTests.testAll()
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class AnchorPlatformCustodyApiRpcEnd2EndTest :
@BeforeAll
@JvmStatic
fun construct() {
println("Running AnchorPlatformCustodyActionsEnd2EndTest")
println("Running AnchorPlatformCustodyApiRpcEnd2EndTest")
singleton.setUp(mapOf())
}

Expand All @@ -28,4 +28,10 @@ class AnchorPlatformCustodyApiRpcEnd2EndTest :
fun runSep24Test() {
singleton.sep24CustodyRpcE2eTests.testAll()
}

@Test
@Order(11)
fun runSep31Test() {
singleton.sep31CustodyRpcE2eTests.testAll()
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -600,7 +600,9 @@ private const val EXPECTED_TXN_REFUND_RESPONSE =
"source_account": "GAIUIZPHLIHQEMNJGSZKCEUWHAZVGUZDBDMO2JXNAJZZZVNSVHQCEWJ4",
"destination_account": "testAddress",
"memo": "testTag",
"memo_type": "id"
"memo_type": "id",
"refund_memo": "12345",
"refund_memo_type" : "id"
}
"""

Expand Down
Loading
Loading