refactor(btcreleaseclient): rename vars

Author: apancorb

src/main/java/co/rsk/federate/btcreleaseclient/BtcReleaseClient.java

@@ -287,22 +287,22 @@ public void onBlock(org.ethereum.core.Block block, List<TransactionReceipt> rece
          * </p>
          *
          * @param currentBlockNumber the current block number in the blockchain
-         * @param svpSpendTx the Keccak256 hash and the Bitcoin transaction of the svp spend transaction waiting to be signed
+         * @param svpSpendTxEntry the Keccak256 hash and the Bitcoin transaction of the svp spend transaction waiting to be signed
          * @return {@code true} if the transaction has the required number of confirmations and is ready to be signed;
          *         {@code false} otherwise
          */
-        private boolean isSVPSpendTxReadyToSign(long currentBlockNumber, Map.Entry<Keccak256, BtcTransaction> svpSpendTx) {
+        private boolean isSVPSpendTxReadyToSign(long currentBlockNumber, Map.Entry<Keccak256, BtcTransaction> svpSpendTxEntry) {
             try {
 
-                BtcTransaction btcTx = svpSpendTx.getValue();
+                BtcTransaction svpSpendTx = svpSpendTxEntry.getValue();
 
-                logger.debug("[isSvpSpendTxReadyToSign] SVP spend tx before removing signatures [{}]", btcTx.getHash());
-                BitcoinUtils.removeSignaturesFromTransactionWithP2shMultiSigInputs(btcTx);
-                logger.debug("[isSvpSpendTxReadyToSign] SVP spend tx after removing signatures [{}]", btcTx.getHash());
+                logger.debug("[isSvpSpendTxReadyToSign] SVP spend tx before removing signatures [{}]", svpSpendTx.getHash());
+                BitcoinUtils.removeSignaturesFromTransactionWithP2shMultiSigInputs(svpSpendTx);
+                logger.debug("[isSvpSpendTxReadyToSign] SVP spend tx after removing signatures [{}]", svpSpendTx.getHash());
 
                 int version = signer.getVersionForKeyId(BTC.getKeyId());
                 ReleaseCreationInformation releaseCreationInformation = releaseCreationInformationGetter.getTxInfoToSign(
-                    version, svpSpendTx.getKey(), btcTx);
+                    version, svpSpendTxEntry.getKey(), svpSpendTx);
 
                 boolean isReadyToSign = Optional.ofNullable(releaseCreationInformation)
                     .map(ReleaseCreationInformation::getPegoutCreationBlock)
@@ -312,7 +312,7 @@ private boolean isSVPSpendTxReadyToSign(long currentBlockNumber, Map.Entry<Kecca
                     .isPresent();
 
                 logger.info("[isSvpSpendTxReadyToSign] SVP spend tx readiness check for signing: tx hash [{}], Current block [{}], Ready to sign? [{}]",
-                    svpSpendTx.getKey(),
+                    svpSpendTxEntry.getKey(),
                     currentBlockNumber,
                     isReadyToSign ? "YES" : "NO");
 

src/test/java/co/rsk/federate/btcreleaseclient/BtcReleaseClientTest.java

@@ -771,9 +771,8 @@ void onBestBlock_whenOnlySvpSpendTxWaitingForSignaturesIsAvailable_shouldAddSign
     @Test
     void onBestBlock_whenSvpSpendTxWaitingForSignaturesIsAvailableWithSignatureFromAnotherFederationMember_shouldSendAddSignature() throws Exception {
         // Arrange
-        List<BtcECKey> federationPrivateKeys = TestUtils.getFederationPrivateKeys(9);
-        Federation proposedFederation = TestUtils.createFederation(bridgeConstants.getBtcParams(), federationPrivateKeys);
-        FederationMember federationMember = proposedFederation.getMembers().get(0);
+        List<BtcECKey> federationKeys = TestUtils.getFederationPrivateKeys(9);
+        Federation proposedFederation = TestUtils.createFederation(bridgeConstants.getBtcParams(), federationKeys);
         Script scriptSig = proposedFederation.getP2SHScript().createEmptyInputScript(null, proposedFederation.getRedeemScript());
 
         BtcTransaction svpSpendTx = new BtcTransaction(params);
@@ -788,7 +787,7 @@ void onBestBlock_whenSvpSpendTxWaitingForSignaturesIsAvailableWithSignatureFromA
             BitcoinTestUtils.signTransactionInputFromP2shMultiSig(
                 svpSpendTx,
                 inputs.indexOf(input),
-                List.of(federationPrivateKeys.get(0))
+                List.of(federationKeys.get(0))
             );
         }
 
@@ -804,6 +803,7 @@ void onBestBlock_whenSvpSpendTxWaitingForSignaturesIsAvailableWithSignatureFromA
         }).when(ethereum).addListener(any(EthereumListener.class));
 
         FederatorSupport federatorSupport = mock(FederatorSupport.class);
+        FederationMember federationMember = proposedFederation.getMembers().get(0);
         doReturn(federationMember).when(federatorSupport).getFederationMember();
         // return svp spend tx waiting for signatures
         doReturn(Optional.of(stateForProposedFederator)).when(federatorSupport).getStateForProposedFederator();