fix tests

Author: Jan Xie

lib/ethereum/tester/abi_contract.rb

@@ -28,8 +28,8 @@ def initialize(state, abi, address, listen: true, log_listener: nil, default_key
         end
       end
 
-      def listen(x)
-        @translator.listen x
+      def listen(x, noprint: true)
+        @translator.listen x, noprint: noprint
       end
 
       private

test/contracts/contract_names.sol

@@ -1,3 +1,5 @@
+pragma solidity ^0.4.0;
+
 contract AContract {}
 library ALibrary {}
 

test/contracts/seven_contract.sol

@@ -1,3 +1,5 @@
+pragma solidity ^0.4.0;
+
 import "seven_library.sol";
 
 contract SevenContract {

test/contracts/seven_contract_without_import.sol

@@ -1,3 +1,5 @@
+pragma solidity ^0.4.0;
+
 library SevenLibrary {
     function seven() returns (int256 y);
 }

test/contracts/seven_library.sol

@@ -1,3 +1,5 @@
+pragma solidity ^0.4.0;
+
 library SevenLibrary {
     function seven() returns (int256 y) {
         y = 7;

test/contracts/simple_contract.sol

@@ -1,3 +1,4 @@
+pragma solidity ^0.4.0;
 contract Simple {
     function test() returns (int256) {
         return 1;

test/contracts_test.rb

@@ -1356,7 +1356,12 @@ def test_abi_logging
     c = @s.abi_contract ABI_LOGGING_CODE
     o = []
 
-    @s.block.add_listener(->(x) { o.push(c.listen(x) ) })
+    @s.block.add_listener(->(x) {
+      result = c.listen(x, noprint: false)
+      result.delete('_from')
+      o.push(result)
+    })
+
     c.test_rabbit(3)
     assert_equal [{"_event_type" => "rabbit", "x" => 3}], o
 
@@ -1443,7 +1448,13 @@ def moo():
   def test_string_logging
     c = @s.abi_contract STRING_LOGGING_CODE
     o = []
-    @s.block.add_listener(->(x) { o.push c.listen(x) })
+
+    @s.block.add_listener(->(x) {
+      result = c.listen(x, noprint: false)
+      result.delete('_from')
+      o.push(result)
+    })
+
     c.moo
 
     expect = [

test/solidity_test.rb

@@ -13,6 +13,7 @@ def test_compile_from_file
     Dir.mktmpdir('contracts-') do |dir|
       lib_path = File.join dir, 'Other.sol'
       File.write lib_path, <<-EOF
+          pragma solidity ^0.4.0;
           library Other {
               function seven() returns (int256 y) {
                   y = 7;
@@ -22,6 +23,7 @@ def test_compile_from_file
 
       user_path = File.join dir, 'user.sol'
       File.write user_path, <<-EOF
+          pragma solidity ^0.4.0;
           import "Other.sol";
           contract user {
               function test() returns (int256 seven) {
@@ -53,6 +55,8 @@ def sub1():
           return(5)
   EOF
   SOLIDITY_CONTRACT = <<-EOF
+      pragma solidity ^0.4.0;
+
       contract serpent { function sub1() returns (int256 y) {} }
 
       contract zoo {
@@ -78,6 +82,7 @@ def test_interop
   end
 
   COMPILE_RICH_CONTRACT = <<-EOF
+      pragma solidity ^0.4.0;
       contract contract_add {
           function add7(uint a) returns(uint d) { return a + 7; }
           function add42(uint a) returns(uint d) { return a + 42; }
@@ -104,6 +109,7 @@ def test_solidity_compile_rich
   end
 
   CONSTRUCTOR_CONTRACT = <<-EOF
+      pragma solidity ^0.4.0;
       contract testme {
           uint value;
           function testme(uint a) {
@@ -121,6 +127,7 @@ def test_constructor
 
   def test_abi_contract
     one_contract = <<-EOF
+        pragma solidity ^0.4.0;
         contract foo {
             function seven() returns (int256 y) {
                 y = 7;
@@ -132,6 +139,7 @@ def test_abi_contract
     EOF
 
     two_contracts = one_contract + <<-EOF
+        pragma solidity ^0.4.0;
         contract baz {
             function echo(address a) returns (address b) {
                 b = a;