Merge branch 'master' into bhushan/examples

Snowfork · Apr 30, 2021 · b7f1de7 · b7f1de7
2 parents 66d2454 + fda2aeb
commit b7f1de7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/contracts/GovernanceDecisions.sol b/contracts/GovernanceDecisions.sol
@@ -9,15 +9,15 @@ 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_);
-        marketplaceFee = 1; // set default marketplace fee
+        marketplaceFee = 10; // set default marketplace fee
     }
 
     function setMarketplaceFee(uint8 fee) external {
@@ -41,14 +41,14 @@ contract GovernanceDecisions is AccessControl {
         return marketplaceCategories;
     }
 
-    function addMember(string calldata member) external {
-        require(hasRole(GOVERNOR_ROLE, msg.sender), "GovernanceDecisions::addMember 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;
     }
 }
diff --git a/test/GovernanceDecisions.test.js b/test/GovernanceDecisions.test.js
@@ -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")
         });
     });
 });