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

Update to new terms across all our code #66

Merged
merged 10 commits into from
Mar 9, 2018
Merged

Update to new terms across all our code #66

merged 10 commits into from
Mar 9, 2018

Conversation

terencechain
Copy link
Member

@terencechain terencechain commented Mar 8, 2018

Here is the list of todos to update terms across all our code

  • Update main Sharding folder with the new terms
  • Update cli entry points with the new terms
  • Update validator_manager.sol with the new terms
  • Refactor client to collator client

func (c *Client) VMCCaller() *contracts.VMCCaller {
return &c.vmc.VMCCaller
// VMCCaller to interact with the sharding manager contract.
func (c *Client) VMCCaller() *contracts.SMCCaller {
Copy link
Member

Choose a reason for hiding this comment

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

SMCCaller

@prestonvanloon
Copy link
Member

Please run tests and lint. Travis is red

@terencechain
Copy link
Member Author

Will do. Travis is red because VMC.sol and the bindings are still old

@terencechain terencechain changed the title Update to new terms across all our code WIP: Update to new terms across all our code Mar 8, 2018
Copy link
Member

@prestonvanloon prestonvanloon left a comment

Choose a reason for hiding this comment

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

Please update PR title and description.

// Checks if our deposit has gone through according to the VMC
b, err := c.VMCCaller().IsValidatorDeposited(&bind.CallOpts{}, account.Address)
// Checks if our deposit has gone through according to the SMC
b, err := c.SMCCaller().IsCollatorDeposited(&bind.CallOpts{}, account.Address)
Copy link
Member

Choose a reason for hiding this comment

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

Just return the result of this method call. No need for the following if else statement

@terencechain terencechain self-assigned this Mar 9, 2018
@terencechain terencechain modified the milestones: Diamond, Ruby Mar 9, 2018
Copy link
Member

@prestonvanloon prestonvanloon left a comment

Choose a reason for hiding this comment

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

Please update title and description of PR. It still says work in progress.

return false, err
}
// Checks if our deposit has gone through according to the SMC
b, err := c.SMCCaller().IsCollatorDeposited(&bind.CallOpts{}, account.Address)
Copy link
Member

Choose a reason for hiding this comment

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

return c.SMCCaller()...

No need for these variables

@terencechain terencechain changed the title WIP: Update to new terms across all our code Update to new terms across all our code Mar 9, 2018
@nisdas
Copy link
Member

nisdas commented Mar 9, 2018

Rename from vmc.go to smc.go

Copy link
Member

@prestonvanloon prestonvanloon left a comment

Choose a reason for hiding this comment

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

Travis is flakey, but looks good to me

@terencechain terencechain merged commit ac411ee into prysmaticlabs:master Mar 9, 2018
@terencechain terencechain deleted the new-glossary-rename-terms branch March 9, 2018 15:41
Redidacove pushed a commit to Redidacove/prysm that referenced this pull request Aug 13, 2024
Ashely Yan has added her updates of week 1
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.

3 participants