Merge pull request #303 from rsksmart/remove-pre-reed-setup

Removes pre reed setup

Author: marcos-iov

lib/tests/change-federation.js

@@ -125,7 +125,6 @@ const execute = (description, newFederationConfig, segwitToSegwitFederationChang
     let notAuthorized1Address;
     let notAuthorized2Address;
     let notAuthorized3Address;
-    let reed800IsActive;
 
     describe(description, async function() {
 
@@ -179,22 +178,14 @@ const execute = (description, newFederationConfig, segwitToSegwitFederationChang
 
             newFederationBtcPublicKeys = newFederationPublicKeys.map(federator => federator[KEY_TYPE_BTC]);
 
-            reed800IsActive = await Runners.common.forks.reed800.isAlreadyActive();
-
             const expectedNewFederationErpRedeemScriptBuffer = redeemScriptParser.getP2shErpRedeemScript(newFederationBtcPublicKeys.map(key => removePrefix0x(key)), ERP_PUBKEYS, ERP_CSV_VALUE);
             expectedNewFederationErpRedeemScript = expectedNewFederationErpRedeemScriptBuffer.toString('hex');
 
-            expectedNewFederationAddress = reed800IsActive ?
-                redeemScriptParser.getP2shP2wshAddressFromRedeemScript('REGTEST', expectedNewFederationErpRedeemScriptBuffer)
-                    :
-                redeemScriptParser.getAddressFromRedeemScript('REGTEST', expectedNewFederationErpRedeemScriptBuffer);
+            expectedNewFederationAddress = redeemScriptParser.getP2shP2wshAddressFromRedeemScript('REGTEST', expectedNewFederationErpRedeemScriptBuffer);
 
             const flyoverNewFederationRedeemScript = redeemScriptParser.getFlyoverRedeemScript(expectedNewFederationErpRedeemScriptBuffer, FLYOVER_DERIVATION_HASH);
 
-            expectedFlyoverAddress =  reed800IsActive ? 
-                redeemScriptParser.getP2shP2wshAddressFromRedeemScript('REGTEST', flyoverNewFederationRedeemScript)
-                    :
-                redeemScriptParser.getAddressFromRedeemScript('REGTEST', flyoverNewFederationRedeemScript);
+            expectedFlyoverAddress = redeemScriptParser.getP2shP2wshAddressFromRedeemScript('REGTEST', flyoverNewFederationRedeemScript);
 
             initialActiveFederationInfo = await getActiveFederationInfo(bridge);
 
@@ -482,17 +473,13 @@ const execute = (description, newFederationConfig, segwitToSegwitFederationChang
 
             const svpFundTransaction = bitcoinJsLib.Transaction.fromHex(rawSvpFundTransaction);
 
-            if(!reed800IsActive) {
-                svpFundTransaction.ins.forEach(input => {
-                    expect(input.witness.length).to.be.equal(0, 'The SVP fund transaction inputs should not have witness data when TDB800 is not active.');
-                });
-            } else if(!segwitToSegwitFederationChange) {
+            if(!segwitToSegwitFederationChange) {
                 svpFundTransaction.ins.forEach(input => {
-                    expect(input.witness.length).to.be.equal(0, 'The SVP fund transaction inputs should not have witness data when TDB800 is active and there has been no previous p2sh to p2wsh federation change.');
+                    expect(input.witness.length).to.be.equal(0, 'The SVP fund transaction inputs should not have witness data when there has not been a previous p2sh to p2wsh federation change.');
                 });
             }  else if(segwitToSegwitFederationChange) {
                 svpFundTransaction.ins.forEach(input => {
-                    expect(input.witness.length).to.be.greaterThan(0, 'The SVP fund transaction inputs should have witness data when TDB800 and there has been a previous p2sh to p2wsh federation change.');
+                    expect(input.witness.length).to.be.greaterThan(0, 'The SVP fund transaction inputs should have witness data when there has been a previous p2sh to p2wsh federation change.');
                 });
             }
 
@@ -597,11 +584,9 @@ const execute = (description, newFederationConfig, segwitToSegwitFederationChang
 
             svpSpendBtcTransaction = bitcoinJsLib.Transaction.fromHex(removePrefix0x(releaseBtcEvent.arguments.btcRawTransaction));
 
-            if(reed800IsActive) {
-                svpSpendBtcTransaction.ins.forEach(input => {
-                    expect(input.witness.length).to.be.greaterThan(0, 'The SVP Spend transaction inputs should have witness data when TDB800 is active.');
-                });
-            }
+            svpSpendBtcTransaction.ins.forEach(input => {
+                expect(input.witness.length).to.be.greaterThan(0, 'The SVP Spend transaction inputs should have witness data.');
+            });
 
             // Mining the SVP Spend transaction in bitcoin to register it in the Bridge
             await waitForBitcoinTxToBeInMempool(btcTxHelper, svpSpendBtcTransaction.getId());

test.js

@@ -95,7 +95,7 @@ global.Runners = {
       arrowhead600: createForkObject('arrowhead600', 1),
       arrowhead631: createForkObject('arrowhead631', 1),
       lovell700: createForkObject('lovell700', 1),
-      reed800: createForkObject('reed800', 1900),
+      reed800: createForkObject('reed800', 1),
     },
     additionalFederationAddresses: []
   }

tests/00_00_07-change-federation.js

@@ -1,3 +1,3 @@
 const federationChangeTests = require('../lib/tests/change-federation');
 
-federationChangeTests.execute('Initial Federation change from genesis to p2sh', Runners.config.federations.secondFederation);
+federationChangeTests.execute('Initial Federation change from genesis to p2wsh', Runners.config.federations.secondFederation);

tests/01_00_00-2wp.js

@@ -1,3 +1,3 @@
 const twoWpTests = require('../lib/tests/2wp');
 
-twoWpTests.execute('BTC <=> RSK 2WP after p2sh federation change');
+twoWpTests.execute('BTC <=> RSK 2WP after p2wsh federation change');