Repair problem with mixed up keys in denser-block-log generator.

openhive-network · Jan 24, 2025 · 6193f05 · 6193f05
1 parent aadedd3
commit 6193f05
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 15 deletions.
diff --git a/tests/python/functional/util/block_logs_for_denser/denser_block_log_config.py b/tests/python/functional/util/block_logs_for_denser/denser_block_log_config.py
@@ -46,7 +46,7 @@ def __init__(
     ("denserautotest3", {"transfer": [tt.Asset.Hive(1000), tt.Asset.Hbd(100)], "vesting": tt.Asset.Hive(1000)}),
     ("denserautotest4", {"transfer": [tt.Asset.Hive(100), tt.Asset.Hbd(100)], "vesting": tt.Asset.Hive(100)}),
     *(
-        (f"denserautotest-{i}", {"transfer": [tt.Asset.Hive(1), tt.Asset.Hbd(1)], "vesting": tt.Asset.Hive(1)})
+        (f"denserautotest{i}", {"transfer": [tt.Asset.Hive(1), tt.Asset.Hbd(1)], "vesting": tt.Asset.Hive(1)})
         for i in range(5, 10)
     ),
 ]

diff --git a/tests/python/functional/util/block_logs_for_denser/generate_block_log_for_denser.py b/tests/python/functional/util/block_logs_for_denser/generate_block_log_for_denser.py
@@ -111,10 +111,6 @@ def generate_blocklog_for_denser(input_block_log_directory: Path) -> None:
     tt.logger.info(f"Block_log created successfully. Save in {args.output_block_log_directory} Exiting...")
 
 
-def import_keys(wallet: tt.Wallet, account_name: str) -> None:
-    [wallet.api.import_key(tt.PrivateKey(account_name, secret=key_type)) for key_type in ["active", "owner", "posting"]]
-
-
 def get_absolute_slot_at_time(date_string: str) -> int:
     """
     Function to calculate blocks number, including missing blocks
@@ -152,17 +148,35 @@ def set_chain_spec(block_log: tt.BlockLog, current_hardfork_number: int):
 
 def create_accounts(wallet: tt.Wallet, details: list) -> None:
     for account_name, _ in details:
-        import_keys(wallet, account_name)
+        posting = tt.Account(account_name, secret="posting")
+        active = tt.Account(account_name, secret="active")
+        owner = tt.Account(account_name, secret="owner")
+        memo = tt.Account(account_name, secret="memo")
+
+        wallet.api.import_keys([posting.private_key, active.private_key, owner.private_key, memo.private_key])
+
         wallet.api.create_account_with_keys(
             "blocktrades",
             account_name,
             "{}",
-            posting=tt.PublicKey(account_name=account_name, secret="owner"),
-            active=tt.PublicKey(account_name=account_name, secret="active"),
-            owner=tt.PublicKey(account_name=account_name, secret="posting"),
-            memo=tt.PublicKey(account_name=account_name, secret="memo"),
+            posting=posting.public_key,
+            active=active.public_key,
+            owner=owner.public_key,
+            memo=memo.public_key,
         )
 
+        save_keys_to_file(account_name, posting, active, owner, memo)
+
+
+def save_keys_to_file(
+    account_name: str, posting: tt.Account, active: tt.Account, owner: tt.Account, memo: tt.Account
+) -> None:
+    with open(args.output_block_log_directory.joinpath("account_specification.txt"), "a", encoding="utf-8") as file:
+        file.write(account_name.center(70, "-") + "\n")
+        for key in [posting, active, owner, memo]:
+            file.write(f"{key.secret}-private: {key.private_key}\n{key.secret}-public: {key.public_key}\n")
+        file.write(70 * "-" + "\n\n")
+
 
 def fund_accounts(wallet: tt.Wallet, details: list) -> None:
     for account, ops in details:
@@ -196,16 +210,21 @@ def __init__(self, wallet, community_creator, community_name, details):
         self.details = details
 
     def create(self):
-        import_keys(self.wallet, self.community_name)
+        owner = tt.Account(self.community_name, secret="owner")
+        active = tt.Account(self.community_name, secret="active")
+        posting = tt.Account(self.community_name, secret="posting")
+        memo = tt.Account(self.community_name, secret="memo")
+
+        self.wallet.api.import_keys([owner.private_key, active.private_key, posting.private_key, memo.private_key])
 
         self.wallet.api.create_account_with_keys(
             self.community_creator,
             self.community_name,
             "{}",
-            tt.PublicKey(account_name=self.community_name, secret="owner"),
-            tt.PublicKey(account_name=self.community_name, secret="active"),
-            tt.PublicKey(account_name=self.community_name, secret="posting"),
-            tt.PublicKey(account_name=self.community_name, secret="memo"),
+            owner.public_key,
+            active.public_key,
+            posting.public_key,
+            memo.public_key,
         )
 
     def __send_custom_json(self, json: str, required_auths=None, required_posting_auths=None):