1 files changed, 10 insertions, 9 deletions

diff --git a/test/contracts/Wallet.cpp b/test/contracts/Wallet.cpp
index 98be562c..fb104300 100644
--- a/test/contracts/Wallet.cpp
+++ b/test/contracts/Wallet.cpp
@@ -101,7 +101,7 @@ contract multiowned {
 
 	// constructor is given number of sigs required to do protected "onlymanyowners" transactions
 	// as well as the selection of addresses capable of confirming them.
-	function multiowned(address[] _owners, uint _required) {
+	constructor(address[] _owners, uint _required) {
 		m_numOwners = _owners.length + 1;
 		m_owners[1] = uint(msg.sender);
 		m_ownerIndex[uint(msg.sender)] = 1;
@@ -119,7 +119,7 @@ contract multiowned {
 		// make sure they're an owner
 		if (ownerIndex == 0) return;
 		uint ownerIndexBit = 2**ownerIndex;
-		var pending = m_pending[_operation];
+		PendingState pending = m_pending[_operation];
 		if (pending.ownersDone & ownerIndexBit > 0) {
 			pending.yetNeeded++;
 			pending.ownersDone -= ownerIndexBit;
@@ -177,8 +177,8 @@ contract multiowned {
 		return m_ownerIndex[uint(_addr)] > 0;
 	}
 
-	function hasConfirmed(bytes32 _operation, address _owner) constant returns (bool) {
-		var pending = m_pending[_operation];
+	function hasConfirmed(bytes32 _operation, address _owner) view returns (bool) {
+		PendingState pending = m_pending[_operation];
 		uint ownerIndex = m_ownerIndex[uint(_owner)];
 
 		// make sure they're an owner
@@ -201,7 +201,7 @@ contract multiowned {
 		// make sure they're an owner
 		if (ownerIndex == 0) return;
 
-		var pending = m_pending[_operation];
+		PendingState pending = m_pending[_operation];
 		// if we're not yet working on this operation, switch over and reset the confirmation status.
 		if (pending.yetNeeded == 0) {
 			// reset count of confirmations needed.
@@ -288,7 +288,7 @@ contract daylimit is multiowned {
 	// METHODS
 
 	// constructor - stores initial daily limit and records the present day's index.
-	function daylimit(uint _limit) {
+	constructor(uint _limit) {
 		m_dailyLimit = _limit;
 		m_lastDay = today();
 	}
@@ -319,7 +319,7 @@ contract daylimit is multiowned {
 		return false;
 	}
 	// determines today's index.
-	function today() private constant returns (uint) { return now / 1 days; }
+	function today() private view returns (uint) { return now / 1 days; }
 
 	// FIELDS
 
@@ -369,7 +369,7 @@ contract Wallet is multisig, multiowned, daylimit {
 
 	// constructor - just pass on the owner array to the multiowned and
 	// the limit to daylimit
-	function Wallet(address[] _owners, uint _required, uint _daylimit) payable
+	constructor(address[] _owners, uint _required, uint _daylimit) payable
 			multiowned(_owners, _required) daylimit(_daylimit) {
 	}
 
@@ -379,7 +379,7 @@ contract Wallet is multisig, multiowned, daylimit {
 	}
 
 	// gets called when no other function matches
-	function() payable {
+	function() external payable {
 		// just being sent some cash?
 		if (msg.value > 0)
 			emit Deposit(msg.sender, msg.value);
@@ -451,6 +451,7 @@ protected:
 
 		bytes args = encodeArgs(u256(0x60), _required, _dailyLimit, u256(_owners.size()), _owners);
 		sendMessage(*s_compiledWallet + args, true, _value);
+		BOOST_REQUIRE(m_transactionSuccessful);
 		BOOST_REQUIRE(!m_output.empty());
 	}
 };