Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/same asset migration #99

Merged
merged 11 commits into from
Jan 21, 2022
Merged

Feat/same asset migration #99

merged 11 commits into from
Jan 21, 2022

Conversation

parv3213
Copy link
Member

No description provided.

@parv3213 parv3213 added the WIP Work In Progress label Jan 19, 2022
@parv3213 parv3213 self-assigned this Jan 19, 2022
@parv3213 parv3213 removed the WIP Work In Progress label Jan 20, 2022
@parv3213
Copy link
Member Author

@carlfarterson ready for review and merge.

contracts/migrations/SameAssetTransferMigration.sol Outdated Show resolved Hide resolved
{
function isValid(
address _asset,
bytes memory /* _encodedArgs */
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice 🙌

@@ -546,14 +546,13 @@ const setup = async () => {
).to.be.revertedWith("Invalid _encodedMigrationArgs");
});
it("Fails when current and target hub has same asset", async () => {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will update this test description

@@ -163,6 +154,12 @@ contract MeTokenRegistry is Ownable, IMeTokenRegistry {
meToken_.targetHubId = _targetHubId;
meToken_.migration = _migration;

require(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moving this back with the require() statements

@pegahcarter pegahcarter merged commit 0744fc2 into main Jan 21, 2022
@pegahcarter pegahcarter deleted the feat/same-asset-migration branch January 27, 2022 21:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants