Merge pull request #116 from soramitsu/update/genesis

update scns, add unregisterDefinition tx
soramitsu · Jul 9, 2024 · f754d04 · f754d04
2 parents 03f8b1b + 3548daf
commit f754d04
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 1,991 deletions.
diff --git a/src/test/java/requests/Queries.java b/src/test/java/requests/Queries.java
@@ -1,6 +1,7 @@
 package requests;
 
 import io.gatling.javaapi.core.ChainBuilder;
+import jp.co.soramitsu.iroha2.CryptoUtils;
 import jp.co.soramitsu.iroha2.ExtensionsKt;
 import jp.co.soramitsu.iroha2.generated.SignedQuery;
 import jp.co.soramitsu.iroha2.query.QueryBuilder;
@@ -28,7 +29,10 @@ public class Queries extends Constants {
                         return SignedQuery.Companion.encode(QueryBuilder
                                 .findAllDomains()
                                 .account(ExtensionsKt.asAccountId(session.getString("anotherDevAccountIdSender")))
-                                .buildSigned(Constants.ALICE_KEYPAIR).getQuery());
+                                .buildSigned(CryptoUtils.keyPairFromHex(
+                                        session.getString("publicKeySender"),
+                                        session.getString("privateKeySender")))
+                                .getQuery());
                     }))
             );
 
@@ -43,7 +47,10 @@ public class Queries extends Constants {
                                 return SignedQuery.Companion.encode(QueryBuilder
                                         .findAccountsByDomainId(ExtensionsKt.asDomainId(session.getString("domainIdSender")))
                                         .account(ExtensionsKt.asAccountId(session.getString("anotherDevAccountIdSender")))
-                                        .buildSigned(Constants.ALICE_KEYPAIR).getQuery());
+                                        .buildSigned(CryptoUtils.keyPairFromHex(
+                                                session.getString("publicKeySender"),
+                                                session.getString("privateKeySender")))
+                                        .getQuery());
                             }))
             );
 
@@ -58,7 +65,10 @@ public class Queries extends Constants {
                                 return SignedQuery.Companion.encode(QueryBuilder
                                         .findAllAssets()
                                         .account(ExtensionsKt.asAccountId(session.getString("anotherDevAccountIdSender")))
-                                        .buildSigned(Constants.ALICE_KEYPAIR).getQuery());
+                                        .buildSigned(CryptoUtils.keyPairFromHex(
+                                                session.getString("publicKeySender"),
+                                                session.getString("privateKeySender")))
+                                        .getQuery());
                             }))
             );
 
@@ -73,7 +83,10 @@ public class Queries extends Constants {
                                 return SignedQuery.Companion.encode(QueryBuilder
                                         .findAllTransactions(null)
                                         .account(ExtensionsKt.asAccountId(session.getString("anotherDevAccountIdSender}")))
-                                        .buildSigned(Constants.ALICE_KEYPAIR).getQuery());
+                                        .buildSigned(CryptoUtils.keyPairFromHex(
+                                                session.getString("publicKeySender"),
+                                                session.getString("privateKeySender")))
+                                        .getQuery());
                             }))
             );
 }
diff --git a/src/test/java/requests/Transactions.java b/src/test/java/requests/Transactions.java
@@ -28,7 +28,7 @@ public class Transactions extends Constants {
                                                                 .account(ExtensionsKt.asAccountId(session.getString("anotherDevAccountIdSender")))
                                                                 .chainId(Constants.CHAIN_ID)
                                                                 .registerAssetDefinition(
-                                                                        ExtensionsKt.asAssetDefinitionId(session.getString("domainIdSender")),
+                                                                        ExtensionsKt.asAssetDefinitionId("performance_token_#" + session.getString("domainIdSender")),
                                                                         new AssetType.Numeric(new NumericSpec())
                                                                 )
                                                                 .buildSigned(CryptoUtils.keyPairFromHex(
@@ -40,6 +40,29 @@ public class Transactions extends Constants {
                             )
             ).exec(http("tx_register_definition_id_status").get(Constants.URL_STATUS).check(status().is(200)));
 
+    //TODO: special genesis with 500000 definitionId include 10 assets, object 50000
+    public static ChainBuilder postUnregisterDefinitionId = exec(feed(CSV_FEEDER)).exec(feed(PEERS_FEEDER))
+            .exec(
+                    http("tx_register_definition_id")
+                            .post(session -> {
+                                        return session.getString("peer") + Constants.URL_TRANSACTION;
+                                    }
+                            )
+                            .body(ByteArrayBody(session -> {
+                                                return SignedTransaction.Companion.encode(
+                                                        TransactionBuilder.Companion.builder()
+                                                                .account(ExtensionsKt.asAccountId(session.getString("anotherDevAccountIdSender")))
+                                                                .chainId(Constants.CHAIN_ID)
+                                                                .unregisterAssetDefinition(ExtensionsKt.asAssetDefinitionId("performance_token_#" + session.getString("domainIdSender"))                                                                )
+                                                                .buildSigned(CryptoUtils.keyPairFromHex(
+                                                                        session.getString("publicKeySender"),
+                                                                        session.getString("privateKeySender")))
+                                                );
+                                            }
+                                    )
+                            )
+            ).exec(http("tx_register_definition_id_status").get(Constants.URL_STATUS).check(status().is(200)));
+
     public static ChainBuilder postRegisterDomain = exec(feed(CSV_FEEDER)).exec(feed(PEERS_FEEDER))
             .exec(
                     http("tx_register_domain")

diff --git a/src/test/java/scenarious/DefinitionId.java b/src/test/java/scenarious/DefinitionId.java
@@ -11,6 +11,5 @@ public class DefinitionId {
             .feed(csv("preconditionList.csv").circular())
             .exec(
                     Transactions.postRegisterDefinitionId
-
             );
 }