chore(contract): added checks and some console.log to contract, test TODO done

Author: bitbeckers

contracts/SinglePlayerCommit.sol

@@ -88,6 +88,7 @@ contract SinglePlayerCommit is Ownable {
         address _oracle,
         address _token
     ) public {
+        console.log("Constructor called");
         // set up token interface
         token = IERC20(_token);
 
@@ -170,8 +171,11 @@ contract SinglePlayerCommit is Ownable {
         uint256 _startTime,
         uint256 _stake
     ) public returns (bool) {
+        console.log("makeCommitment called");
+
         require(!commitments[msg.sender].exists, "SPC::makeCommitment - msg.sender already has a commitment");
         require(allowedActivities[_activity].allowed, "SPC::makeCommitment - activity doesn't exist or isn't allowed");
+        require(allowedActivities[_activity].measures.length >= _measureIndex+1, "SPC::makeCommitment - measure index out of bounds");
 
         bytes32 measure = allowedActivities[_activity].measures[_measureIndex];
 

test/SinglePlayerCommit.deploy.ts

@@ -6,6 +6,7 @@ export function shouldDeployWithInitialParameters(): void {
   it("has the 'biking' activity and it is allowed", async function () {
     const activityKey: BytesLike = await this.singlePlayerCommit.activityList(0);
     const _activityName: string = await this.singlePlayerCommit.getActivityName(activityKey);
+ 
 
     const _activity = await this.singlePlayerCommit.allowedActivities(activityKey);
 

test/SinglePlayerCommit.ts

@@ -1,8 +1,8 @@
 //Setup
 import chai from "chai";
 import { ethers } from "@nomiclabs/buidler";
-import { BigNumberish, Signer, ContractFactory, Wallet } from "ethers";
-import { createFixtureLoader, deployMockContract, loadFixture, MockContract, MockProvider, solidity } from "ethereum-waffle";
+import { BigNumberish, Signer, ContractFactory} from "ethers";
+import { deployMockContract, MockContract, MockProvider, solidity } from "ethereum-waffle";
 
 //Artifacts
 import { SinglePlayerCommit } from "../typechain/SinglePlayerCommit";
@@ -15,6 +15,7 @@ import { userCanManageCommitments } from "./SinglePlayerCommit.user";
 import { ownerCanManageContract } from "./SinglePlayerCommit.owner";
 
 chai.use(solidity);
+const bre = require("@nomiclabs/buidler");
 
 setTimeout(async function () {
   describe("SinglePlayerCommit contract", async function () {

test/SinglePlayerCommit.user.ts

@@ -108,21 +108,19 @@ export function userCanManageCommitments(): void {
       const _amountToStake: BigNumber = utils.parseEther("50.0");
 
       //Activity
-      //TODO improve to revertedWith; now returns invalid opcode instead of error message
-      _activity = 'LALALA';
+      _activity = '0xb16dfc4a050ca7e77c1c5f443dc473a2f03ac722e25f721ab6333875f44984f2';
 
       await expect(
         contractWithUser.makeCommitment(_activity, _measureIndex, _goal, _startTime, _amountToStake, _overrides),
-      ).to.be.reverted;
+      ).to.be.revertedWith("SPC::makeCommitment - activity doesn't exist or isn't allowed");
       _activity = await this.singlePlayerCommit.activityList(0);
 
       //Measure
-      //TODO improve to revertedWith; now returns invalid opcode instead of error message
       _measureIndex = 1;
 
       await expect(
         contractWithUser.makeCommitment(_activity, _measureIndex, _goal, _startTime, _amountToStake, _overrides),
-      ).to.be.reverted;
+      ).to.be.revertedWith("SPC::makeCommitment - measure index out of bounds");
       _measureIndex = 0;
 
       //Goal