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

[Delegator.sol ]added a new method to get result from ID and removed strict rule to create collection with same name #698

Merged
merged 19 commits into from
Feb 21, 2022
Merged

[Delegator.sol ]added a new method to get result from ID and removed strict rule to create collection with same name #698

merged 19 commits into from
Feb 21, 2022

Conversation

adi44
Copy link
Contributor

@adi44 adi44 commented Feb 13, 2022 •
edited
Loading

fixes #696
fixes #700

@adi44 adi44 marked this pull request as draft February 13, 2022 17:02
@adi44 adi44 changed the title added a new method to get result from ID [Delegator.sol ]added a new method to get result from ID and removed strict rule to create collection with same name Feb 13, 2022
@adi44
Copy link
Contributor Author

adi44 commented Feb 13, 2022

should we create a new getter to get ID for corresponding name
use initialize in CollectionManager or UpdateAddress?

@coveralls
Copy link

coveralls commented Feb 13, 2022 •
edited
Loading

Coverage Status

Coverage decreased (-0.2%) to 96.121% when pulling c250535 on adi44:delegator into 6a69819 on razor-network:master.

@GasCheckBot
Copy link

GasCheckBot commented Feb 13, 2022 •
edited
Loading

Contract Method Current(Maximum) Master(Maximum) Change%(Maximum) Diff(Maximum) Current(Minimum) Master(Minimum) Diff(Minimum) Change%(Minimum)
BlockManager claimBlockReward 741324 741390 -0.01 -66 66159 66225 -66 -0.1
BlockManager confirmPreviousEpochBlock 39380 39446 -0.17 -66 39380 39446 -66 -0.17
BlockManager disputeForNonAssignedCollection 180760 180744 +0.01 +16.00 180760 180744 +16.00 +0.01
BlockManager giveSorted 109358 109336 +0.02 +22.00 57955 57933 +22.00 +0.04
BlockManager propose 339983 339961 +0.01 +22.00 166023 166001 +22.00 +0.01
CollectionManager createCollection 193015 198977 -3 -5962 165382 171332 -5950 -3.47
CollectionManager createJob 141766 141788 -0.02 -22 124294 124316 -22 -0.02
CollectionManager grantRole 51453 51431 +0.04 +22.00 29213 29191 +22.00 +0.08
CollectionManager revokeRole 29444 29466 -0.07 -22 29444 29466 -22 -0.07
CollectionManager setCollectionStatus 114438 114410 +0.02 +28.00 48133 48105 +28.00 +0.06
CollectionManager updateCollection 56097 56065 +0.06 +32.00 50869 50837 +32.00 +0.06
CollectionManager updateJob 53009 53015 -0.01 -6 53009 53015 -6 -0.01
VoteManager commit 588316 588382 -0.01 -66 110101 110089 +12.00 +0.01
VoteManager reveal 380542 380406 +0.04 +136.00 207232 207144 +88.00 +0.04
Governance setMaxTolerance 51785 51769 +0.03 +16.00 51785 51769 +16.00 +0.03
Delegator grantRole 51380 51358 +0.04 +22.00 51380 51346 +34.00 +0.07

@adi44 adi44 marked this pull request as ready for review February 14, 2022 12:58
SamAg19
SamAg19 previously approved these changes Feb 15, 2022
View reviewed changes
@SkandaBhat SkandaBhat self-requested a review February 15, 2022 07:32
@SkandaBhat SkandaBhat self-assigned this Feb 15, 2022
@SkandaBhat SkandaBhat added this to the v0.3.0 milestone Feb 15, 2022
adi44
adi44 commented Feb 16, 2022
View reviewed changes
contracts/Core/CollectionManager.sol
@@ -215,4 +225,9 @@ contract CollectionManager is CollectionStorage, StateManager, CollectionManager
}
}
}

function _setIDName(string calldata name, uint16 _id) internal {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

add restriction back

@adi44 adi44 requested a review from SamAg19 February 16, 2022 15:23
0xcuriousapple
0xcuriousapple suggested changes Feb 18, 2022
View reviewed changes
contracts/Core/CollectionManager.sol
import "./interface/IVoteManager.sol";
import "./storage/CollectionStorage.sol";
import "../Initializable.sol";
Copy link
Contributor

Choose a reason for hiding this comment

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

hey Initializable being imported twice

@SkandaBhat SkandaBhat merged commit a7ea5e0 into razor-network:master Feb 21, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SkandaBhat SkandaBhat SkandaBhat approved these changes

@0xcuriousapple 0xcuriousapple 0xcuriousapple approved these changes

@SamAg19 SamAg19 Awaiting requested review from SamAg19

Assignees

@SkandaBhat SkandaBhat

Labels
None yet
Projects
None yet
Milestone
v1
Development

Successfully merging this pull request may close these issues.

Move Name to ID and setNametoID method mapping in collection manager Modifications in contracts for Bridge
6 participants
@adi44 @coveralls @GasCheckBot @SkandaBhat @0xcuriousapple @SamAg19