From ccd0c3ffd2885350548d880fc1c8861655eba127 Mon Sep 17 00:00:00 2001 From: Ezerous Date: Wed, 2 Dec 2020 13:54:59 +0200 Subject: [PATCH] Fix deploy --- .../concordia-contracts/migrations/2_deploy_contracts.js | 6 +++--- packages/concordia-contracts/package.json | 2 +- packages/concordia-contracts/test/TestVoting.sol | 4 ++-- yarn.lock | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/concordia-contracts/migrations/2_deploy_contracts.js b/packages/concordia-contracts/migrations/2_deploy_contracts.js index df11216..7d1f449 100644 --- a/packages/concordia-contracts/migrations/2_deploy_contracts.js +++ b/packages/concordia-contracts/migrations/2_deploy_contracts.js @@ -4,8 +4,8 @@ const PostVoting = artifacts.require('PostVoting'); // eslint-disable-next-line func-names module.exports = function (deployer) { - deployer.deploy(Forum).then((forum) => { - deployer.deploy(Voting, forum.address); - deployer.deploy(PostVoting, forum.address); + deployer.deploy(Forum).then(async (forum) => { + await deployer.deploy(Voting, forum.address); + await deployer.deploy(PostVoting, forum.address); }); }; diff --git a/packages/concordia-contracts/package.json b/packages/concordia-contracts/package.json index aba8e5d..60bd035 100644 --- a/packages/concordia-contracts/package.json +++ b/packages/concordia-contracts/package.json @@ -14,7 +14,7 @@ }, "dependencies": { "@openzeppelin/contracts": "~3.2.0", - "truffle": "~5.1.45" + "truffle": "~5.1.55" }, "devDependencies": { "eslint": "^6.8.0", diff --git a/packages/concordia-contracts/test/TestVoting.sol b/packages/concordia-contracts/test/TestVoting.sol index c62998f..6925740 100644 --- a/packages/concordia-contracts/test/TestVoting.sol +++ b/packages/concordia-contracts/test/TestVoting.sol @@ -17,10 +17,10 @@ contract TestVoting { (firstTopicId,) = forum.createTopic(); } - function testIsPollExistent() public { + function testIfPollExists() public { Voting voting = Voting(DeployedAddresses.Voting()); - bool actual = voting.isPollExistent(firstTopicId); + bool actual = voting.pollExists(firstTopicId); Assert.equal(actual, false, "Poll should not exist"); } diff --git a/yarn.lock b/yarn.lock index c356e49..b320cea 100644 --- a/yarn.lock +++ b/yarn.lock @@ -16347,10 +16347,10 @@ tr46@^1.0.1: dependencies: punycode "^2.1.0" -truffle@~5.1.45: - version "5.1.53" - resolved "https://registry.yarnpkg.com/truffle/-/truffle-5.1.53.tgz#3c984317d092f230d84b7d138d69dace106b5c2b" - integrity sha512-JXuuhPOsh/K9K9PJTcZDRy6ByxreOrchMIM1SgEVRi85MF6XWQSZwwV1kXF+JRtP938lfRmmpgWQb1MzFBY7qw== +truffle@~5.1.55: + version "5.1.55" + resolved "https://registry.yarnpkg.com/truffle/-/truffle-5.1.55.tgz#ec5e245213e4f0f42ef836308b50a8d79355a649" + integrity sha512-chZM43DOo7aCn+z1Pcj5f4ts9YqnHhKI31CZ+B6N93nbWKnIrBN/hBZeEXSi9s9FZ3nsmp+Iplr5Z4dnHAqDxA== dependencies: app-module-path "^2.2.0" mocha "8.1.2"