Minor refactoring & correction of test generation.

Author: aarlt

test/libsolidity/SemanticTest.cpp

@@ -271,7 +271,10 @@ TestCase::TestResult SemanticTest::runTest(ostream& _stream, string const& _line
 
 					if (m_transactionSuccessful != !test.call().expectations.failure || outputMismatch)
 						success = false;
-					success = checkLogs(test);
+
+					if (success)
+						success = checkLogs(test);
+
 					test.setFailure(!m_transactionSuccessful);
 				}
 
@@ -450,10 +453,10 @@ bool SemanticTest::checkLogs(TestFunctionCall& _call)
 
 		// Finally we update the consumed logs within the producer.
 		for (auto& logIdx: m_touchedLogs[&producer->call()])
-			producer->consumedLogs().insert(logIdx);
+			producer->consumedLogIndexes().insert(logIdx);
 
 		// It is ok if some builtins consumed log events.
-		return producer->consumedLogs().size() >= producer->logs().size();
+		return producer->consumedLogIndexes().size() >= producer->logs().size();
 	}
 	return true;
 }

test/libsolidity/semanticTests/events/event_emit.sol

@@ -2,17 +2,23 @@ contract ClientReceipt {
     event A(address _from, bytes32 _id, uint _value);
     event B(address _from, bytes32 _id, uint indexed _value) anonymous;
     event C(address _from, bytes32 indexed _id, uint _value);
-    function deposit(bytes32 _id) public payable {
+    function deposit(bytes32 _id) public payable returns(uint256) {
         emit A(msg.sender, _id, msg.value);
         emit B(msg.sender, _id, msg.value);
         emit C(msg.sender, _id, msg.value);
+
+        return  msg.value;
     }
 }
 
 // ====
 // compileViaYul: false
 // ----
-// deposit(bytes32), 18 wei: 0x1234 ->
-// logs.expectEvent(uint256,string): 0, "A(address,bytes32,uint256)" -> 0x1212121212121212121212121212120000000012, 0x1234, 0x12
-// logs.expectEvent(uint256,string): 1, "" -> 0x12, 0x1212121212121212121212121212120000000012, 0x1234
-// logs.expectEvent(uint256,string): 2, "C(address,bytes32,uint256)" -> 0x1234, 0x1212121212121212121212121212120000000012, 0x12
+// deposit(bytes32), 28 wei: 0x1234 -> 0x1c
+// logs.expectEvent(uint256,string): 0, "A(address,bytes32,uint256)" -> 0x1212121212121212121212121212120000000012, 0x1234, 0x1c
+// logs.expectEvent(uint256,string): 1, "" -> 0x1c, 0x1212121212121212121212121212120000000012, 0x1234
+// logs.expectEvent(uint256,string): 2, "C(address,bytes32,uint256)" -> 0x1234, 0x1212121212121212121212121212120000000012, 0x1c
+// deposit(bytes32), 23 wei: 0x1234 -> 0x17
+// logs.expectEvent(uint256,string): 0, "A(address,bytes32,uint256)" -> 0x1212121212121212121212121212120000000012, 0x1234, 0x17
+// logs.expectEvent(uint256,string): 1, "" -> 0x17, 0x1212121212121212121212121212120000000012, 0x1234
+// logs.expectEvent(uint256,string): 2, "C(address,bytes32,uint256)" -> 0x1234, 0x1212121212121212121212121212120000000012, 0x17