QA: feature_fedpeg.py: Move from --parent_bitcoin to --parent_type

Author: jtimon

.travis.yml

@@ -72,7 +72,7 @@ script:
     - if [ "$RUN_TESTS" = "true" ]; then qa/pull-tester/rpc-tests.py --coverage; fi
     - if [ "$RUN_FEDPEG_BITCOIND" = "true" ]; then BITCOIND_VERSION=0.16.3 && BITCOIND_ARCH=x86_64-linux-gnu; fi
     - if [ "$RUN_FEDPEG_BITCOIND" = "true" ]; then wget https://bitcoincore.org/bin/bitcoin-core-$BITCOIND_VERSION/bitcoin-$BITCOIND_VERSION-$BITCOIND_ARCH.tar.gz && tar -zxf bitcoin-$BITCOIND_VERSION-$BITCOIND_ARCH.tar.gz && rm bitcoin-$BITCOIND_VERSION-$BITCOIND_ARCH.tar.gz; fi
-    - if [ "$RUN_FEDPEG_BITCOIND" = "true" ]; then qa/rpc-tests/feature_fedpeg.py --parent_bitcoin --parent_binpath $(pwd)/bitcoin-$BITCOIND_VERSION/bin/bitcoind; fi
+    - if [ "$RUN_FEDPEG_BITCOIND" = "true" ]; then qa/rpc-tests/feature_fedpeg.py --parent_type=bitcoin --parent_binpath $(pwd)/bitcoin-$BITCOIND_VERSION/bin/bitcoind; fi
 after_script:
     - echo $TRAVIS_COMMIT_RANGE
     - echo $TRAVIS_COMMIT_LOG

qa/rpc-tests/feature_fedpeg.py

@@ -33,21 +33,26 @@ def __init__(self):
     def add_options(self, parser):
         parser.add_option("--parent_binpath", dest="parent_binpath", default="",
                           help="Use a different binary for launching nodes")
-        parser.add_option("--parent_bitcoin", dest="parent_bitcoin", default=False, action="store_true",
-                          help="Parent nodes are Bitcoin")
+        parser.add_option("--parent_type", dest="parent_type", default="elements",
+                          help="Type of parent nodes {elements, bitcoin}")
 
     def setup_network(self, split=False):
-        if self.options.parent_bitcoin and self.options.parent_binpath == "":
-            raise Exception("Can't run with --parent_bitcoin without specifying --parent_binpath")
         self.nodes = []
         self.extra_args = []
+
+        if self.options.parent_type not in ['elements', 'bitcoin']:
+            raise Exception("Invalid option --parent_type=%s, valid options: elements, bitcoin" % self.options.parent_type)
+
+        if self.options.parent_type == 'bitcoin' and self.options.parent_binpath == "":
+            raise Exception("Can't run with --parent_type=bitcoin without specifying --parent_binpath")
+
         # Parent chain args
         for n in range(2):
             # We want to test the rpc cookie method so we force the use of a
             # dummy conf file to avoid loading rpcuser/rpcpassword lines
             use_cookie_auth = n==1
             rpc_u, rpc_p = rpc_auth_pair(n)
-            if self.options.parent_bitcoin:
+            if self.options.parent_type == 'bitcoin':
                 self.parent_chain = 'regtest'
                 self.extra_args.append([
                     "-conf=dummy",
@@ -78,7 +83,7 @@ def setup_network(self, split=False):
         connect_nodes_bi(self.nodes, 0, 1)
         self.parentgenesisblockhash = self.nodes[0].getblockhash(0)
         print('parentgenesisblockhash', self.parentgenesisblockhash)
-        if not self.options.parent_bitcoin:
+        if self.options.parent_type == 'elements':
             parent_pegged_asset = self.nodes[0].getsidechaininfo()['pegged_asset']
 
         # Sidechain args
@@ -99,7 +104,7 @@ def setup_network(self, split=False):
                 '-mainchainrpcport=%s' % rpc_port(n),
                 '-recheckpeginblockinterval=15', # Long enough to allow failure and repair before timeout
             ]
-            if not self.options.parent_bitcoin:
+            if self.options.parent_type == 'elements':
                 args.extend([
                     '-parentpubkeyprefix=235',
                     '-parentscriptprefix=75',