Test senate

Author: thewhaleking

bittensor_cli/cli.py

@@ -1116,7 +1116,7 @@ def verbosity_handler(
         if quiet and verbose:
             err_console.print("Cannot specify both `--quiet` and `--verbose`")
             raise typer.Exit()
-        if json_console and verbose:
+        if json_output and verbose:
             verbosity_console_handler(3)
         elif json_output or quiet:
             verbosity_console_handler(0)

bittensor_cli/src/commands/sudo.py

@@ -355,13 +355,13 @@ def display_votes(
 def serialize_vote_data(
     vote_data: "ProposalVoteData", delegate_info: dict[str, DelegatesDetails]
 ) -> list[dict[str, bool]]:
-    vote_list = []
+    vote_list = {}
     for address in vote_data.ayes:
         f_add = delegate_info[address].display if address in delegate_info else address
-        vote_list.append({f_add: True})
+        vote_list[f_add] = True
     for address in vote_data.nays:
         f_add = delegate_info[address].display if address in delegate_info else address
-        vote_list.append({f_add: False})
+        vote_list[f_add] = False
     return vote_list
 
 

tests/e2e_tests/test_senate.py

@@ -9,6 +9,7 @@
 
 import asyncio
 import json
+
 from .utils import call_add_proposal
 
 
@@ -104,7 +105,6 @@ def test_senate(local_chain, wallet_setup):
             "--verbose",
         ],
     )
-    print(">>>", proposals.stdout, proposals.stderr)
     proposals_output = proposals.stdout.splitlines()[9].split()
 
     # Assert the hash is of correct format
@@ -114,7 +114,7 @@ def test_senate(local_chain, wallet_setup):
     # 0 Ayes for the proposal
     assert proposals_output[2] == "0"
 
-    # 0 Nayes for the proposal
+    # 0 Nays for the proposal
     assert proposals_output[4] == "0"
 
     # Assert initial threshold is 3
@@ -123,15 +123,16 @@ def test_senate(local_chain, wallet_setup):
     json_proposals = exec_command_bob(
         command="sudo",
         sub_command="proposals",
-        extra_args=[
-            "--chain",
-            "ws://127.0.0.1:9945",
-            "--json-output"
-        ]
+        extra_args=["--chain", "ws://127.0.0.1:9945", "--json-output"],
     )
-    json_proposals_outout = json.loads(json_proposals.stdout)
+    json_proposals_output = json.loads(json_proposals.stdout)
 
-    assert False, json_proposals_outout
+    assert len(json_proposals_output) == 1
+    assert json_proposals_output[0]["threshold"] == 3
+    assert json_proposals_output[0]["ayes"] == 0
+    assert json_proposals_output[0]["nays"] == 0
+    assert json_proposals_output[0]["votes"] == {}
+    assert json_proposals_output[0]["call_data"] == "System.remark(remark: (0,))"
 
     # Vote on the proposal by Bob (vote aye)
     vote_aye = exec_command_bob(
@@ -176,6 +177,26 @@ def test_senate(local_chain, wallet_setup):
     # Nay votes remain 0
     assert proposals_after_aye_output[4] == "0"
 
+    proposals_after_aye_json = exec_command_bob(
+        command="sudo",
+        sub_command="proposals",
+        extra_args=[
+            "--chain",
+            "ws://127.0.0.1:9945",
+            "--json-output",
+        ],
+    )
+    proposals_after_aye_json_output = json.loads(proposals_after_aye_json.stdout)
+    assert len(proposals_after_aye_json_output) == 1
+    assert proposals_after_aye_json_output[0]["threshold"] == 3
+    assert proposals_after_aye_json_output[0]["ayes"] == 1
+    assert proposals_after_aye_json_output[0]["nays"] == 0
+    assert len(proposals_after_aye_json_output[0]["votes"]) == 1
+    assert proposals_after_aye_json_output[0]["votes"][keypair_bob.ss58_address] is True
+    assert (
+        proposals_after_aye_json_output[0]["call_data"] == "System.remark(remark: (0,))"
+    )
+
     # Register Alice to the root network (0)
     # Registering to root automatically makes you a senator if eligible
     root_register = exec_command_alice(
@@ -245,4 +266,20 @@ def test_senate(local_chain, wallet_setup):
     # Assert vote casted as Nay
     assert proposals_after_nay_output[10].split()[1] == "Nay"
 
+    proposals_after_nay_json = exec_command_bob(
+        command="sudo",
+        sub_command="proposals",
+        extra_args=[
+            "--chain",
+            "ws://127.0.0.1:9945",
+            "--json-output",
+        ],
+    )
+    proposals_after_nay_json_output = json.loads(proposals_after_nay_json.stdout)
+    assert len(proposals_after_nay_json_output) == 1
+    assert proposals_after_nay_json_output[0]["nays"] == 1
+    assert (
+        proposals_after_nay_json_output[0]["votes"][keypair_alice.ss58_address] is False
+    )
+
     print("✅ Passed senate commands")

tests/e2e_tests/test_staking_sudo.py

@@ -148,7 +148,7 @@ def test_staking(local_chain, wallet_setup):
             wallet_alice.name,
             "--chain",
             "ws://127.0.0.1:9945",
-            "--json-output"
+            "--json-output",
         ],
     )