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.

Sign up for GitHub

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

Jump to bottom

Rename Core >safe core and origin core >mosaic core #522

Merged
merged 12 commits into from
Dec 11, 2018
Merged

Rename Core >safe core and origin core >mosaic core #522

merged 12 commits into from
Dec 11, 2018

Conversation

0xsarvesh
Copy link
Contributor

@0xsarvesh 0xsarvesh commented Dec 5, 2018 •
edited
Loading

Fixes #500

Renamed core to safe core and origin core to mosaic core.

@0xsarvesh 0xsarvesh self-assigned this Dec 5, 2018
@0xsarvesh 0xsarvesh changed the title Core >safe core and origin core >mosaic core Rename Core >safe core and origin core >mosaic core Dec 5, 2018
@schemar
Copy link
Contributor

schemar commented Dec 5, 2018

@sarvesh-ost can you please resolve the conflicts before we review it?

@0xsarvesh
Copy link
Contributor Author

0xsarvesh commented Dec 5, 2018 •
edited
Loading

@sarvesh-ost can you please resolve the conflicts before we review it?

It's now available for review.

schemar
schemar suggested changes Dec 6, 2018
View reviewed changes
Copy link
Contributor

@schemar schemar left a comment

Choose a reason for hiding this comment

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

Should not be reviewed until #518 is merged and this is rebased...

contracts/core/MosaicCore.sol Outdated Show resolved Hide resolved
contracts/core/PollingPlace.sol Outdated
auxiliaryCoreIdentifier = auxiliaryBlockStore.getCoreIdentifier();

blockStores[originCoreIdentifier] = originBlockStore;
blockStores[mosaicCoreIdentifier] = originBlockStore;
Copy link
Contributor

Choose a reason for hiding this comment

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

This should stay as origin core identifier. This is about the core identifiers on origin and auxiliary, not about "origin core". So PollingPlace should not change.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

schemar
schemar approved these changes Dec 10, 2018
View reviewed changes
Copy link
Contributor

@schemar schemar left a comment

Choose a reason for hiding this comment

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

LGTM 🙌

Just some tiny things in-line. Also, it is very hard to review as it is hard to spot places where you didn't rename something 🤔 So someone else should definitely have a look as well...

contracts/test/core/MockCore.sol Outdated Show resolved Hide resolved
test/core/kernel_gateway/activate_kernel.js Outdated Show resolved Hide resolved
test/core/origin_core/constructor.js Show resolved Hide resolved
Sarvesh Jain added 2 commits December 10, 2018 22:55
Merge remote-tracking branch 'upstream/develop' into Core->SafeCore_a…
e992a19 
…nd_Origin_core->Mosaic_core

# Conflicts:
#	test/core/kernel_gateway/prove_origin_core.js
PR feedback review
a41d405
deepesh-kn
deepesh-kn approved these changes Dec 11, 2018
View reviewed changes
Copy link
Contributor

@deepesh-kn deepesh-kn left a comment

Choose a reason for hiding this comment

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

LGTM 🏇💨

@deepesh-kn deepesh-kn merged commit e37c673 into OpenST:develop Dec 11, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@schemar schemar schemar approved these changes

@deepesh-kn deepesh-kn deepesh-kn approved these changes

@gulshanvasnani gulshanvasnani Awaiting requested review from gulshanvasnani

Assignees

@0xsarvesh 0xsarvesh

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@0xsarvesh @schemar @deepesh-kn @benjaminbollen