Skip to content

Commit

Permalink
Merge pull request #20 from Snowfork/bhushan/refactor-membership
Browse files Browse the repository at this point in the history
Refactored membership to foundation membership
  • Loading branch information
musnit authored Apr 28, 2021
2 parents aefe4b9 + 80984b2 commit fda2aeb
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
14 changes: 7 additions & 7 deletions contracts/GovernanceDecisions.sol
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ contract GovernanceDecisions is AccessControl {

uint8 public marketplaceFee;
string[] private marketplaceCategories;
string[] private memberships;
string[] private foundationMemberships;

event MarketplaceFeeChanged(uint8 oldFee, uint8 newFee);
event MarketplaceCategoryAdded(string category);
event MemberAdded(string member);
event FoundationMemberAdded(string member);

constructor(address governor_) public {
_setupRole(GOVERNOR_ROLE, governor_);
Expand Down Expand Up @@ -41,14 +41,14 @@ contract GovernanceDecisions is AccessControl {
return marketplaceCategories;
}

function addMember(string calldata member) external {
require(hasRole(GOVERNOR_ROLE, msg.sender), "DecisionModel::setMarketplaceFee ACCESS FORBIDDEN");
function addFoundationMember(string calldata member) external {
require(hasRole(GOVERNOR_ROLE, msg.sender), "GovernanceDecisions::addFoundationMember ACCESS FORBIDDEN");

memberships.push(member);
emit MemberAdded(member);
foundationMemberships.push(member);
emit FoundationMemberAdded(member);
}

function getMemberships() public view returns (string[] memory) {
return memberships;
return foundationMemberships;
}
}
4 changes: 2 additions & 2 deletions test/GovernanceDecisions.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@ describe("GovernanceDecisions", () => {

describe("memberships", () => {
it("allows governor to add membership", async () => {
await decisionModel.addMember("sample member", { from: governor });
await decisionModel.addFoundationMember("sample member", { from: governor });
expect(await decisionModel.getMemberships()).to.include("sample member")
});

it("reverts if the sender is not governor", async () => {
expect(decisionModel.addMember("sample member", { from: a1 })).to.eventually.be.rejectedWith("revert DecisionModel::setMarketplaceFee ACCESS FORBIDDEN")
expect(decisionModel.addFoundationMember("sample member", { from: a1 })).to.eventually.be.rejectedWith("revert DecisionModel::setMarketplaceFee ACCESS FORBIDDEN")
});
});
});

0 comments on commit fda2aeb

Please sign in to comment.