From 7f3b8b3e05d28c8288f16a50ee31de45a3fc5fab Mon Sep 17 00:00:00 2001 From: timofeevmd Date: Fri, 12 Jul 2024 13:02:17 +0400 Subject: [PATCH 1/2] Merge remote-tracking branch 'origin/update/genesis' into update/genesis Signed-off-by: timofeevmd --- src/test/java/requests/Transactions.java | 35 +++++++++++++++------ src/test/java/scenarious/TransferAsset.java | 2 +- 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/src/test/java/requests/Transactions.java b/src/test/java/requests/Transactions.java index a463a72..f44a403 100644 --- a/src/test/java/requests/Transactions.java +++ b/src/test/java/requests/Transactions.java @@ -11,7 +11,8 @@ import static io.gatling.javaapi.core.CoreDsl.*; import static io.gatling.javaapi.http.HttpDsl.http; import static io.gatling.javaapi.http.HttpDsl.status; - +import static requests.Constants.CSV_FEEDER; +import static requests.Constants.PEERS_FEEDER; public class Transactions extends Constants { @@ -53,7 +54,7 @@ public class Transactions extends Constants { TransactionBuilder.Companion.builder() .account(ExtensionsKt.asAccountId(session.getString("anotherDevAccountIdSender"))) .chainId(Constants.CHAIN_ID) - .unregisterAssetDefinition(ExtensionsKt.asAssetDefinitionId("performance_token_#" + session.getString("domainIdSender")) ) + .unregisterAssetDefinition(ExtensionsKt.asAssetDefinitionId("performance_token_#" + session.getString("domainIdSender"))) .buildSigned(CryptoUtils.keyPairFromHex( session.getString("publicKeySender"), session.getString("privateKeySender"))) @@ -103,18 +104,32 @@ public class Transactions extends Constants { session.getString("publicKeySender"), session.getString("privateKeySender") )) - /*TransactionBuilder.Companion.builder() - .account(ExtensionsKt.asAccountId("CE7FA46C9DCE7EA4B125E2E36BDB63EA33073E7590AC92816AE1E861B7048B03@wonderland")) + ); + } + ) + ) + ).exec(http("tx_register_domain_status").get(Constants.URL_STATUS).check(status().is(200))); + + public static ChainBuilder debuggingPostTransferAsset = exec(feed(CSV_FEEDER)).exec(feed(PEERS_FEEDER)) + .exec( + http("debugging_tx_transfer_asset") + .post(session -> { + return session.getString("peer") + Constants.URL_TRANSACTION; + } + ).body(ByteArrayBody(session -> { + return SignedTransaction.Companion.encode( + TransactionBuilder.Companion.builder() + .account(ExtensionsKt.asAccountId("b24ff6ab1e5923f125d7f4eb0c62528eb6b8e84139e17fb377e2bd5fc1498b19@bulb_7405035c-e673-4a46-8f7f-1cca0a0687fa_6138d709-b7e0-44e6-b5dd-1f26f848f464")) .chainId(Constants.CHAIN_ID) - .transferAsset(ExtensionsKt.asAssetId("rose#wonderland#CE7FA46C9DCE7EA4B125E2E36BDB63EA33073E7590AC92816AE1E861B7048B03@wonderland"), + /* drop ed0120*/.transferAsset(ExtensionsKt.asAssetId("xora08da796-bca3-475f-bf94-30cc918ef69b_c687b817-3a68-4848-81bc-d4915801cee1##b24ff6ab1e5923f125d7f4eb0c62528eb6b8e84139e17fb377e2bd5fc1498b19@bulb_7405035c-e673-4a46-8f7f-1cca0a0687fa_6138d709-b7e0-44e6-b5dd-1f26f848f464"), 1, - ExtensionsKt.asAccountId("04FF5B81046DDCCF19E2E451C45DFB6F53759D4EB30FA2EFA807284D1CC33016@wonderland")) + /*drop ed0120*/ExtensionsKt.asAccountId("7d5ad42de2c9c7f4b1faa7e12a9fc58d831189a59ad60daa6a3a88af9dc2a2e2@bulb_7405035c-e673-4a46-8f7f-1cca0a0687fa_6138d709-b7e0-44e6-b5dd-1f26f848f464")) .buildSigned(CryptoUtils.keyPairFromHex( - "7233bfc89dcbd68c19fde6ce6158225298ec1131b6a130d1aeb454c1ab5183c0", - "9ac47abf59b356e0bd7dcbbbb4dec080e302156a48ca907e47cb6aea1d32719e"))*/ - ); + "b24ff6ab1e5923f125d7f4eb0c62528eb6b8e84139e17fb377e2bd5fc1498b19", + "272d70e7efbee4f4c9bc61a2b30deb43194ac1b5e18d06fbba0374d3505c36c8")) + ); } ) ) - ).exec(http("tx_register_domain_status").get(Constants.URL_STATUS).check(status().is(200))); + ).exec(http("debugging_tx_register_domain_status").get(Constants.URL_STATUS).check(status().is(200))); } diff --git a/src/test/java/scenarious/TransferAsset.java b/src/test/java/scenarious/TransferAsset.java index 60b9e27..e44d4f9 100644 --- a/src/test/java/scenarious/TransferAsset.java +++ b/src/test/java/scenarious/TransferAsset.java @@ -11,6 +11,6 @@ public class TransferAsset { public static ScenarioBuilder transferAsset = scenario("transfer asset") .feed(csv("preconditionList.csv").circular()) .exec( - Transactions.postTransferAsset + Transactions.debuggingPostTransferAsset ); } From 24c8567084e611ee71ea9d03090fb228d2b8bf0e Mon Sep 17 00:00:00 2001 From: timofeevmd Date: Mon, 15 Jul 2024 11:58:35 +0400 Subject: [PATCH 2/2] Merge remote-tracking branch 'origin/update/genesis' into update/genesis Signed-off-by: timofeevmd --- src/test/java/requests/Transactions.java | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/test/java/requests/Transactions.java b/src/test/java/requests/Transactions.java index f44a403..1017dcb 100644 --- a/src/test/java/requests/Transactions.java +++ b/src/test/java/requests/Transactions.java @@ -3,16 +3,12 @@ import io.gatling.javaapi.core.ChainBuilder; import jp.co.soramitsu.iroha2.CryptoUtils; import jp.co.soramitsu.iroha2.ExtensionsKt; -import jp.co.soramitsu.iroha2.generated.AssetType; -import jp.co.soramitsu.iroha2.generated.NumericSpec; -import jp.co.soramitsu.iroha2.generated.SignedTransaction; +import jp.co.soramitsu.iroha2.generated.*; import jp.co.soramitsu.iroha2.transaction.TransactionBuilder; import static io.gatling.javaapi.core.CoreDsl.*; import static io.gatling.javaapi.http.HttpDsl.http; import static io.gatling.javaapi.http.HttpDsl.status; -import static requests.Constants.CSV_FEEDER; -import static requests.Constants.PEERS_FEEDER; public class Transactions extends Constants { @@ -119,7 +115,7 @@ public class Transactions extends Constants { ).body(ByteArrayBody(session -> { return SignedTransaction.Companion.encode( TransactionBuilder.Companion.builder() - .account(ExtensionsKt.asAccountId("b24ff6ab1e5923f125d7f4eb0c62528eb6b8e84139e17fb377e2bd5fc1498b19@bulb_7405035c-e673-4a46-8f7f-1cca0a0687fa_6138d709-b7e0-44e6-b5dd-1f26f848f464")) + /*crypto*/.account(ExtensionsKt.asAccountId("b24ff6ab1e5923f125d7f4eb0c62528eb6b8e84139e17fb377e2bd5fc1498b19@bulb_7405035c-e673-4a46-8f7f-1cca0a0687fa_6138d709-b7e0-44e6-b5dd-1f26f848f464")) .chainId(Constants.CHAIN_ID) /* drop ed0120*/.transferAsset(ExtensionsKt.asAssetId("xora08da796-bca3-475f-bf94-30cc918ef69b_c687b817-3a68-4848-81bc-d4915801cee1##b24ff6ab1e5923f125d7f4eb0c62528eb6b8e84139e17fb377e2bd5fc1498b19@bulb_7405035c-e673-4a46-8f7f-1cca0a0687fa_6138d709-b7e0-44e6-b5dd-1f26f848f464"), 1, @@ -130,6 +126,16 @@ public class Transactions extends Constants { ); } ) + ).check( + status().is(200), + bodyString().saveAs("responseBody") ) - ).exec(http("debugging_tx_register_domain_status").get(Constants.URL_STATUS).check(status().is(200))); + ).exec(http("debugging_tx_register_domain_status").get(Constants.URL_STATUS).check(status().is(200))) + .exec(session -> { + String responseBody = session.getString("responseBody"); + System.out.println("Response: " + responseBody); + return session; + }); } + +