undo

Author: jtimon

qa/rpc-tests/feature_fedpeg.py

@@ -49,38 +49,38 @@ def setup_network(self, split=False):
         self.binary = self.options.parent_binpath if self.options.parent_binpath != "" else None
 
         if self.options.parent_type == 'signet':
-            from binascii import hexlify
-            from test_framework import script, key
-            from test_framework.util import hex_str_to_bytes
-            import shutil
-            temp_args = [
-                "-port=" + str(p2p_port(0)),
-                "-rpcport=" + str(rpc_port(0)),
-                "-addresstype=legacy",
-                "-deprecatedrpc=validateaddress"
-            ]
-            temp_node = start_node(0, self.options.tmpdir, temp_args, binary=self.binary, chain='signet', cookie_auth=True)
-            # raise Exception('aaa')
-            addr = temp_node.getnewaddress()
-            k = key.CECKey()
-            pub = temp_node.validateaddress(addr)["pubkey"]
-            print('pub', pub)
-            k.set_pubkey(hex_str_to_bytes(pub))
-            pubkey = key.CPubKey(k.get_pubkey())
-            wif = temp_node.dumpprivkey(addr)
-            stop_node(temp_node, 0)
-            datadir = os.path.join(self.options.tmpdir, 'node0', 'signet')
-            print('datadir', datadir)
-            shutil.rmtree(datadir)
-
-            # import hashlib, random, codecs
-            # from test_framework import script, key, address
             # from binascii import hexlify
+            # from test_framework import script, key
+            # from test_framework.util import hex_str_to_bytes
+            # import shutil
+            # temp_args = [
+            #     "-port=" + str(p2p_port(0)),
+            #     "-rpcport=" + str(rpc_port(0)),
+            #     "-addresstype=legacy",
+            #     "-deprecatedrpc=validateaddress"
+            # ]
+            # temp_node = start_node(0, self.options.tmpdir, temp_args, binary=self.binary, chain='signet', cookie_auth=True)
+            # # raise Exception('aaa')
+            # addr = temp_node.getnewaddress()
             # k = key.CECKey()
-            # pk_bytes = hashlib.sha256(str(random.getrandbits(256)).encode('utf-8')).digest()
-            # k.set_secretbytes(pk_bytes)
-            # wif = address.byte_to_base58(pk_bytes, 217)
+            # pub = temp_node.validateaddress(addr)["pubkey"]
+            # print('pub', pub)
+            # k.set_pubkey(hex_str_to_bytes(pub))
             # pubkey = key.CPubKey(k.get_pubkey())
+            # wif = temp_node.dumpprivkey(addr)
+            # stop_node(temp_node, 0)
+            # datadir = os.path.join(self.options.tmpdir, 'node0', 'signet')
+            # print('datadir', datadir)
+            # shutil.rmtree(datadir)
+
+            import hashlib, random, codecs
+            from test_framework import script, key, address
+            from binascii import hexlify
+            k = key.CECKey()
+            pk_bytes = hashlib.sha256(str(random.getrandbits(256)).encode('utf-8')).digest()
+            k.set_secretbytes(pk_bytes)
+            wif = address.byte_to_base58(pk_bytes, 217)
+            pubkey = key.CPubKey(k.get_pubkey())
             script = script.CScript([pubkey, script.OP_CHECKSIG])
             blockscript = hexlify(script).decode('ascii')
             print('blockscript', blockscript)
@@ -351,11 +351,12 @@ def run_test(self):
         print("Test pegout")
         self.test_pegout(get_new_unconfidential_address(parent), sidechain)
 
-        print("Test pegout P2SH")
-        parent_chain_addr = get_new_unconfidential_address(parent)
-        parent_pubkey = parent.validateaddress(parent_chain_addr)["pubkey"]
-        parent_chain_p2sh_addr = parent.createmultisig(1, [parent_pubkey])["address"]
-        self.test_pegout(parent_chain_p2sh_addr, sidechain)
+        if self.options.parent_type != 'signet':
+            print("Test pegout P2SH")
+            parent_chain_addr = get_new_unconfidential_address(parent)
+            parent_pubkey = parent.validateaddress(parent_chain_addr)["pubkey"]
+            parent_chain_p2sh_addr = parent.createmultisig(1, [parent_pubkey])["address"]
+            self.test_pegout(parent_chain_p2sh_addr, sidechain)
 
         print("Test pegout Garbage")
         parent_chain_addr = "garbage"