Refactor federation #2143
Merged
Refactor federation #2143
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
marcos-iov
reviewed
Sep 27, 2023
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
…n StandardMultisig and ErpFederation to be consistent with hashCode
marcos-iov
reviewed
Oct 2, 2023
rskj-core/src/main/java/co/rsk/peg/StandardMultisigFederation.java
Outdated
Show resolved
Hide resolved
rskj-core/src/test/java/co/rsk/peg/BridgeStorageProviderFederationTests.java
Outdated
Show resolved
Hide resolved
| members, | ||
| Instant.now(), | ||
| 123, | ||
| bridgeConstants.getBtcParams() | ||
| ); | ||
| byte[] serializedTestFederation = BridgeSerializationUtils.serializeFederation(testFederation); | ||
| System.out.println(serializedTestFederation); |
Check notice
Code scanning / CodeQL
Implicit conversion from array to string
| @@ -1269,14 +1270,18 @@ | |||
| activations | |||
| ); | |||
| byte[] serializedTestErpFederation = BridgeSerializationUtils.serializeFederation(testErpFederation); | |||
| System.out.println(serializedTestErpFederation); | |||
Check notice
Code scanning / CodeQL
Implicit conversion from array to string
Comment on lines
+57
to
+61
| ErpFederationRedeemScriptParser.createErpRedeemScriptDeprecated( | ||
| ScriptBuilder.createRedeemScript(getNumberOfSignaturesRequired(), getBtcPublicKeys()), | ||
| ScriptBuilder.createRedeemScript(erpPubKeys.size() / 2 + 1, erpPubKeys), | ||
| activationDelay | ||
| ); |
Check notice
Code scanning / CodeQL
Deprecated method or constructor invocation
julia-zack
changed the base branch from
master
to
federations-refactor-integration
marcos-iov
reviewed
Oct 3, 2023
|
Have a look at the code smells, there ara many unused imports and other stuff of simple solution |
…ame variables. Remove logs. Fix some code smells.
marcos-iov
reviewed
Oct 4, 2023
rskj-core/src/test/java/co/rsk/peg/StandardMultisigFederationTest.java
Outdated
Show resolved
Hide resolved
rskj-core/src/test/java/co/rsk/peg/StandardMultisigFederationTest.java
Outdated
Show resolved
Hide resolved
marcos-iov
reviewed
Oct 6, 2023
rskj-core/src/main/java/co/rsk/peg/BridgeSerializationUtils.java
Outdated
Show resolved
Hide resolved
|
Kudos, SonarCloud Quality Gate passed! |
marcos-iov
approved these changes
Oct 6, 2023
kelvinator07
approved these changes
Oct 6, 2023
kelvinator07
merged commit 10e3014
into
federations-refactor-integration
2 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Refactor Federation classes.
Make Federation class abstract.
Create a new class StandardMultisigFederation that inherits from Federation.
Create a new abstract class ErpFederation that inherits from Federation and adds the behavior related to the ERP, rename current ERPFederation class to LegacyErpFederation and tag it as deprecated (this is the class that generates the faulty non standard redeem script).
Make P2SHErpFederation class inherit from ERPFederation.
Eventually, we will add a new class P2shP2wshErpFederation class that also inherits from ERPFederation.