From 1d54b86a7c7d919957e68f65b227ddedaadd4a81 Mon Sep 17 00:00:00 2001 From: Tal Ater Date: Tue, 17 Oct 2017 21:02:47 +0300 Subject: [PATCH 1/2] Replace deprecated throw with assert in Solidity tests --- test/helpers/ReentrancyAttack.sol | 4 +--- test/helpers/ReentrancyMock.sol | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/test/helpers/ReentrancyAttack.sol b/test/helpers/ReentrancyAttack.sol index 7eac47820..14458144f 100644 --- a/test/helpers/ReentrancyAttack.sol +++ b/test/helpers/ReentrancyAttack.sol @@ -3,9 +3,7 @@ pragma solidity ^0.4.11; contract ReentrancyAttack { function callSender(bytes4 data) { - if(!msg.sender.call(data)) { - throw; - } + assert(msg.sender.call(data)); } } diff --git a/test/helpers/ReentrancyMock.sol b/test/helpers/ReentrancyMock.sol index 411e72197..178b14cf1 100644 --- a/test/helpers/ReentrancyMock.sol +++ b/test/helpers/ReentrancyMock.sol @@ -27,9 +27,7 @@ contract ReentrancyMock is ReentrancyGuard { if(n > 0) { count(); bool result = this.call(func, n - 1); - if(result != true) { - throw; - } + assert(result == true); } } From 5fc53b6f2f49b121d42682ff3834e5e41d051ba3 Mon Sep 17 00:00:00 2001 From: Tal Ater Date: Sun, 19 Nov 2017 01:34:24 +0200 Subject: [PATCH 2/2] Replaced assert with require --- test/helpers/ReentrancyAttack.sol | 2 +- test/helpers/ReentrancyMock.sol | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/helpers/ReentrancyAttack.sol b/test/helpers/ReentrancyAttack.sol index 14458144f..37b5cffd7 100644 --- a/test/helpers/ReentrancyAttack.sol +++ b/test/helpers/ReentrancyAttack.sol @@ -3,7 +3,7 @@ pragma solidity ^0.4.11; contract ReentrancyAttack { function callSender(bytes4 data) { - assert(msg.sender.call(data)); + require(msg.sender.call(data)); } } diff --git a/test/helpers/ReentrancyMock.sol b/test/helpers/ReentrancyMock.sol index 178b14cf1..63162fd92 100644 --- a/test/helpers/ReentrancyMock.sol +++ b/test/helpers/ReentrancyMock.sol @@ -27,7 +27,7 @@ contract ReentrancyMock is ReentrancyGuard { if(n > 0) { count(); bool result = this.call(func, n - 1); - assert(result == true); + require(result == true); } }