aboutsummaryrefslogtreecommitdiffstats
path: root/test/libsolidity
diff options
context:
space:
mode:
Diffstat (limited to 'test/libsolidity')
-rw-r--r--test/libsolidity/JSONCompiler.cpp11
-rw-r--r--test/libsolidity/SolidityABIJSON.cpp20
2 files changed, 21 insertions, 10 deletions
diff --git a/test/libsolidity/JSONCompiler.cpp b/test/libsolidity/JSONCompiler.cpp
index 541cfbf0..7dc4808b 100644
--- a/test/libsolidity/JSONCompiler.cpp
+++ b/test/libsolidity/JSONCompiler.cpp
@@ -23,22 +23,13 @@
#include <boost/test/unit_test.hpp>
#include <libdevcore/JSON.h>
#include <libsolidity/interface/Version.h>
+#include <solc/jsonCompiler.h>
#include "../Metadata.h"
#include "../TestHelper.h"
using namespace std;
-extern "C"
-{
-extern char const* version();
-extern char const* license();
-extern char const* compileJSON(char const* _input, bool _optimize);
-extern char const* compileJSONMulti(char const* _input, bool _optimize);
-extern char const* compileJSONCallback(char const* _input, bool _optimize, void* _readCallback);
-extern char const* compileStandard(char const* _input, void* _readCallback);
-}
-
namespace dev
{
namespace solidity
diff --git a/test/libsolidity/SolidityABIJSON.cpp b/test/libsolidity/SolidityABIJSON.cpp
index 0512ba1f..4b9223de 100644
--- a/test/libsolidity/SolidityABIJSON.cpp
+++ b/test/libsolidity/SolidityABIJSON.cpp
@@ -423,6 +423,8 @@ BOOST_AUTO_TEST_CASE(events)
function f(uint a) returns(uint d) { return a * 7; }
event e1(uint b, address indexed c);
event e2();
+ event e2(uint a);
+ event e3() anonymous;
}
)";
char const* interface = R"([
@@ -467,6 +469,24 @@ BOOST_AUTO_TEST_CASE(events)
"type": "event",
"anonymous": false,
"inputs": []
+ },
+ {
+ "name": "e2",
+ "type": "event",
+ "anonymous": false,
+ "inputs": [
+ {
+ "indexed": false,
+ "name": "a",
+ "type": "uint256"
+ }
+ ]
+ },
+ {
+ "name": "e3",
+ "type": "event",
+ "anonymous": true,
+ "inputs": []
}
])";