getblockchaininfo: remove incorrect fields 'signblock_asm' and 'signb…

…lock_hex' from rpc response
ElementsProject · Apr 28, 2022 · efdb2f4 · efdb2f4
1 parent 80862ff
commit efdb2f4
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 11 deletions.
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
@@ -1444,10 +1444,8 @@ RPCHelpMan getblockchaininfo()
     obj.pushKV("size_on_disk",          CalculateCurrentUsage());
     obj.pushKV("pruned",                fPruneMode);
     if (g_signed_blocks) {
-        CScript sign_block_script = chainparams.GetConsensus().signblockscript;
-        obj.pushKV("signblock_asm", ScriptToAsmStr(sign_block_script));
-        obj.pushKV("signblock_hex", HexStr(sign_block_script));
         if (!IsDynaFedEnabled(::ChainActive().Tip(), chainparams.GetConsensus())) {
+            CScript sign_block_script = chainparams.GetConsensus().signblockscript;
             obj.pushKV("current_signblock_asm", ScriptToAsmStr(sign_block_script));
             obj.pushKV("current_signblock_hex", HexStr(sign_block_script));
             obj.pushKV("max_block_witness", (uint64_t)chainparams.GetConsensus().max_block_signature_size);

diff --git a/test/functional/feature_blocksign.py b/test/functional/feature_blocksign.py
@@ -111,7 +111,6 @@ def mine_block(self, make_transactions):
         if is_dyna:
             wsh_wrap = self.nodes[0].decodescript(self.witnessScript)['segwit']['hex']
             assert_equal(wsh_wrap, blockchain_info['current_signblock_hex'])
-            assert blockchain_info['current_signblock_hex'] != blockchain_info['signblock_hex']
 
         # Make a few transactions to make non-empty blocks for compact transmission
         if make_transactions:
@@ -207,10 +206,6 @@ def run_test(self):
         assert 'signblock_witness_asm' in block
         assert 'signblock_witness_hex' in block
 
-        signblockscript = make_signblockscript(self.num_keys, self.required_signers, self.keys)
-        assert_equal(info['signblock_asm'], self.nodes[0].decodescript(signblockscript)['asm'])
-        assert_equal(info['signblock_hex'], signblockscript)
-
         assert_equal(info['softforks']['dynafed']['bip9']['status'], "defined")
 
         # Next let's activate dynafed

diff --git a/test/functional/feature_dynafed.py b/test/functional/feature_dynafed.py
@@ -100,7 +100,6 @@ def test_legacy_params(self):
 
             # blocksigner is OP_TRUE, extension space is hardcoded one in chainparams
             signblock_info = self.nodes[i].getblockchaininfo()
-            assert_equal(signblock_info["signblock_hex"], "51")
             assert_equal(signblock_info["current_signblock_hex"], "51")
             assert_equal(signblock_info["max_block_witness"], 74)
             assert_equal(signblock_info["extension_space"], initial_extension)

diff --git a/test/functional/rpc_blockchain.py b/test/functional/rpc_blockchain.py
@@ -81,8 +81,6 @@ def _test_getblockchaininfo(self):
             'max_block_witness',
             'mediantime',
             'pruned',
-            'signblock_asm',
-            'signblock_hex',
             'size_on_disk',
             'softforks',
             'verificationprogress',