From 167c34a42a2f8238bfd126ee4e9fe21f07917cd3 Mon Sep 17 00:00:00 2001 From: Szymon Szlachtowicz <38212223+Szymx95@users.noreply.github.com> Date: Tue, 6 Jul 2021 15:34:48 +0200 Subject: [PATCH] Fix getCommunityVoting (#89) --- packages/DApp/src/providers/config/config.ts | 2 +- packages/contracts/contracts/MockContract.sol | 2 -- packages/contracts/test/1.mockContract.test.ts | 3 --- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/packages/DApp/src/providers/config/config.ts b/packages/DApp/src/providers/config/config.ts index f282f59..1c6560f 100644 --- a/packages/DApp/src/providers/config/config.ts +++ b/packages/DApp/src/providers/config/config.ts @@ -16,7 +16,7 @@ interface EnvConfigs { const contracts = { 3: { - votingContract: '0xF8739d0dDC51aCC421808b6b887f4A34bEB92960', + votingContract: '0x942C8248d14c20b9E79d7A60178B5b17Dd7186c3', }, } diff --git a/packages/contracts/contracts/MockContract.sol b/packages/contracts/contracts/MockContract.sol index fae2e13..5ae95be 100644 --- a/packages/contracts/contracts/MockContract.sol +++ b/packages/contracts/contracts/MockContract.sol @@ -51,8 +51,6 @@ contract MockContract { uint256 roomNumber ) { - require(communityVotingId[publicKey] > 0, 'vote not found'); - require(votingRoomMap[communityVotingId[publicKey]].endAt > block.timestamp, 'vote ended'); startBlock = votingRoomMap[communityVotingId[publicKey]].startBlock; endAt = votingRoomMap[communityVotingId[publicKey]].endAt; voteType = votingRoomMap[communityVotingId[publicKey]].voteType; diff --git a/packages/contracts/test/1.mockContract.test.ts b/packages/contracts/test/1.mockContract.test.ts index c4421fb..af85431 100644 --- a/packages/contracts/test/1.mockContract.test.ts +++ b/packages/contracts/test/1.mockContract.test.ts @@ -186,10 +186,7 @@ describe('Contract', () => { BigNumber.from(1), ]) - await expect(contract.getCommunityVoting(secondAddress.address)).to.be.revertedWith('vote not found') - await provider.send('evm_mine', [Math.floor(Date.now() + 10000)]) - await expect(contract.getCommunityVoting(firstAddress.address)).to.be.revertedWith('vote ended') await contract.initializeVotingRoom(1, secondAddress.address) expect((await contract.getCommunityVoting(secondAddress.address)).slice(2)).to.deep.eq([ 1,