diff --git a/eth/main.cpp b/eth/main.cpp index f333ce2d6..a5624b69b 100644 --- a/eth/main.cpp +++ b/eth/main.cpp @@ -411,7 +411,7 @@ void doFarm(MinerType _m, string const& _remote, unsigned _recheckPeriod) exit(0); } -void stopMiningAfterXBlocks(eth::Client *_c, unsigned _start, unsigned _mining) +void stopMiningAfterXBlocks(eth::Client* _c, unsigned _start, unsigned _mining) { if (_c->isMining() && _c->blockChain().details().number - _start == _mining) _c->stopMining(); diff --git a/libjsconsole/CMakeLists.txt b/libjsconsole/CMakeLists.txt index f54b7a1c7..e8f98de88 100644 --- a/libjsconsole/CMakeLists.txt +++ b/libjsconsole/CMakeLists.txt @@ -19,10 +19,7 @@ set(EXECUTABLE jsconsole) file(GLOB HEADERS "*.h") -include(EthUtils) -eth_add_resources("${CMAKE_CURRENT_SOURCE_DIR}/JSResources.cmake" JSRES) - -add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS} ${JSRES}) +add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS}) target_link_libraries(${EXECUTABLE} jsengine) target_link_libraries(${EXECUTABLE} devcore) diff --git a/libjsconsole/JSConsole.cpp b/libjsconsole/JSConsole.cpp index 15fbb1671..791df2de4 100644 --- a/libjsconsole/JSConsole.cpp +++ b/libjsconsole/JSConsole.cpp @@ -36,8 +36,8 @@ using namespace dev; using namespace dev::eth; JSConsole::JSConsole(WebThreeDirect& _web3, std::vector const& _accounts): - m_engine(), - m_printer(m_engine) + m_engine(), + m_printer(m_engine) { m_jsonrpcConnector.reset(new JSV8Connector(m_engine)); m_jsonrpcServer.reset(new WebThreeStubServer(*m_jsonrpcConnector.get(), _web3, _accounts)); diff --git a/libjsconsole/JSResources.cmake b/libjsconsole/JSResources.cmake deleted file mode 100644 index 889dd2f2b..000000000 --- a/libjsconsole/JSResources.cmake +++ /dev/null @@ -1,7 +0,0 @@ - -set(web3 "${CMAKE_CURRENT_LIST_DIR}/../libjsqrc/ethereumjs/dist/web3.js") - -set(ETH_RESOURCE_NAME "JSConsoleResources") -set(ETH_RESOURCE_LOCATION "${CMAKE_CURRENT_BINARY_DIR}") -set(ETH_RESOURCES "web3") - diff --git a/libjsconsole/JSV8Connector.cpp b/libjsconsole/JSV8Connector.cpp index 21295bec0..ed560a368 100644 --- a/libjsconsole/JSV8Connector.cpp +++ b/libjsconsole/JSV8Connector.cpp @@ -36,14 +36,14 @@ bool JSV8Connector::StopListening() return true; } -bool JSV8Connector::SendResponse(std::string const &_response, void *_addInfo) +bool JSV8Connector::SendResponse(std::string const& _response, void* _addInfo) { (void)_addInfo; m_lastResponse = _response.c_str(); return true; } -void JSV8Connector::onSend(const char *payload) +void JSV8Connector::onSend(char const* payload) { OnRequest(payload, NULL); } diff --git a/libjsconsole/JSV8Connector.h b/libjsconsole/JSV8Connector.h index 5ad9c177c..98cef4c2c 100644 --- a/libjsconsole/JSV8Connector.h +++ b/libjsconsole/JSV8Connector.h @@ -30,18 +30,20 @@ namespace dev namespace eth { -class JSV8Connector : public jsonrpc::AbstractServerConnector, public JSV8RPC +class JSV8Connector: public jsonrpc::AbstractServerConnector, public JSV8RPC { public: - JSV8Connector(JSV8Engine const &_engine) : JSV8RPC(_engine) {} + JSV8Connector(JSV8Engine const& _engine): JSV8RPC(_engine) {} virtual ~JSV8Connector(); + // implement AbstractServerConnector interface bool StartListening(); bool StopListening(); - bool SendResponse(std::string const& _response, void* _addInfo = NULL); + bool SendResponse(std::string const& _response, void* _addInfo = nullptr); - void onSend(const char* payload); + // implement JSV8RPC interface + void onSend(char const* payload); }; } diff --git a/libjsengine/JSEngine.h b/libjsengine/JSEngine.h index 78937a536..ce54379a1 100644 --- a/libjsengine/JSEngine.h +++ b/libjsengine/JSEngine.h @@ -37,6 +37,7 @@ public: JSString(char const* _cstr); ~JSString(); char const* cstr() const { return m_cstr; } + private: char* m_cstr; }; diff --git a/libjsengine/JSPrinter.h b/libjsengine/JSPrinter.h index d5f84d2d3..bf13fcea7 100644 --- a/libjsengine/JSPrinter.h +++ b/libjsengine/JSPrinter.h @@ -39,4 +39,3 @@ public: } } - diff --git a/libjsengine/JSV8Engine.cpp b/libjsengine/JSV8Engine.cpp index 437bcb6a4..4e06f0f65 100644 --- a/libjsengine/JSV8Engine.cpp +++ b/libjsengine/JSV8Engine.cpp @@ -42,29 +42,29 @@ static char const* toCString(v8::String::Utf8Value const& _value) // from: https://github.com/v8/v8-git-mirror/blob/master/samples/shell.cc // v3.15 from: https://chromium.googlesource.com/v8/v8.git/+/3.14.5.9/samples/shell.cc -void reportException(v8::TryCatch*_try_catch) +void reportException(v8::TryCatch* _tryCatch) { v8::HandleScope handle_scope; - v8::String::Utf8Value exception(_try_catch->Exception()); - char const* exception_string = toCString(exception); - v8::Handle message = _try_catch->Message(); + v8::String::Utf8Value exception(_tryCatch->Exception()); + char const* exceptionString = toCString(exception); + v8::Handle message = _tryCatch->Message(); // V8 didn't provide any extra information about this error; just // print the exception. if (message.IsEmpty()) - printf("%s\n", exception_string); + printf("%s\n", exceptionString); else { // Print (filename):(line number): (message). v8::String::Utf8Value filename(message->GetScriptResourceName()); - char const* filename_string = toCString(filename); + char const* filenameString = toCString(filename); int linenum = message->GetLineNumber(); - printf("%s:%i: %s\n", filename_string, linenum, exception_string); + printf("%s:%i: %s\n", filenameString, linenum, exceptionString); // Print line of source code. v8::String::Utf8Value sourceline(message->GetSourceLine()); - char const* sourceline_string = toCString(sourceline); - printf("%s\n", sourceline_string); + char const* sourcelineString = toCString(sourceline); + printf("%s\n", sourcelineString); // Print wavy underline (GetUnderline is deprecated). int start = message->GetStartColumn(); @@ -78,11 +78,11 @@ void reportException(v8::TryCatch*_try_catch) printf("\n"); - v8::String::Utf8Value stack_trace(_try_catch->StackTrace()); - if (stack_trace.length() > 0) + v8::String::Utf8Value stackTrace(_tryCatch->StackTrace()); + if (stackTrace.length() > 0) { - char const* stack_trace_string = toCString(stack_trace); - printf("%s\n", stack_trace_string); + char const* stackTraceString = toCString(stackTrace); + printf("%s\n", stackTraceString); } } } diff --git a/libjsengine/JSV8Engine.h b/libjsengine/JSV8Engine.h index d785a71ba..56459c5d0 100644 --- a/libjsengine/JSV8Engine.h +++ b/libjsengine/JSV8Engine.h @@ -33,18 +33,18 @@ namespace eth class JSV8Env; class JSV8Scope; -class JSV8Value : public JSValue +class JSV8Value: public JSValue { public: JSV8Value(v8::Handle _value): m_value(_value) {} JSString toString() const; - v8::Handle const& value() const { return m_value; } + private: v8::Handle m_value; }; -class JSV8Engine : public JSEngine +class JSV8Engine: public JSEngine { public: JSV8Engine(); diff --git a/libjsengine/JSV8Printer.h b/libjsengine/JSV8Printer.h index 0d9d06e0d..2ec9c78b6 100644 --- a/libjsengine/JSV8Printer.h +++ b/libjsengine/JSV8Printer.h @@ -30,7 +30,7 @@ namespace dev namespace eth { -class JSV8Printer : public JSPrinter +class JSV8Printer: public JSPrinter { public: JSV8Printer(JSV8Engine const& _engine); diff --git a/libjsengine/JSV8RPC.cpp b/libjsengine/JSV8RPC.cpp index e75bfeada..994cfbbf2 100644 --- a/libjsengine/JSV8RPC.cpp +++ b/libjsengine/JSV8RPC.cpp @@ -30,7 +30,7 @@ namespace dev namespace eth { -v8::Handle JSV8RPCSend(v8::Arguments const& args) +v8::Handle JSV8RPCSend(v8::Arguments const& _args) { v8::Local JSON = v8::String::New("JSON"); v8::Local parse = v8::String::New("parse"); @@ -39,10 +39,10 @@ v8::Handle JSV8RPCSend(v8::Arguments const& args) v8::Handle parseFunc = v8::Handle::Cast(jsonObject->Get(parse)); v8::Handle stringifyFunc = v8::Handle::Cast(jsonObject->Get(stringify)); - v8::Local self = args.Holder(); + v8::Local self = _args.Holder(); v8::Local wrap = v8::Local::Cast(self->GetInternalField(0)); JSV8RPC* that = static_cast(wrap->Value()); - v8::Local vals[1] = {args[0]->ToObject()}; + v8::Local vals[1] = {_args[0]->ToObject()}; v8::Local stringifiedArg = stringifyFunc->Call(stringifyFunc, 1, vals); v8::String::Utf8Value str(stringifiedArg); that->onSend(*str); @@ -54,7 +54,7 @@ v8::Handle JSV8RPCSend(v8::Arguments const& args) } } -JSV8RPC::JSV8RPC(JSV8Engine const &_engine): m_engine(_engine) +JSV8RPC::JSV8RPC(JSV8Engine const& _engine): m_engine(_engine) { v8::HandleScope scope; v8::Local rpcTemplate = v8::ObjectTemplate::New(); diff --git a/libjsengine/JSV8RPC.h b/libjsengine/JSV8RPC.h index 7dfb42392..a2180ef51 100644 --- a/libjsengine/JSV8RPC.h +++ b/libjsengine/JSV8RPC.h @@ -33,14 +33,14 @@ class JSV8RPC { public: JSV8RPC(JSV8Engine const& _engine); - virtual void onSend(const char* _payload) = 0; - const char* lastResponse() const { return m_lastResponse; } + virtual void onSend(char const* _payload) = 0; + char const* lastResponse() const { return m_lastResponse; } private: JSV8Engine const& m_engine; protected: - const char* m_lastResponse; + char const* m_lastResponse; }; }