style fixes

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();

libjsconsole/CMakeLists.txt

@@ -19,10 +19,7 @@ set(EXECUTABLE jsconsole)
 
 file(GLOB HEADERS "*.h")
 
-include(EthUtils)
+add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
-eth_add_resources("${CMAKE_CURRENT_SOURCE_DIR}/JSResources.cmake" JSRES)
-
-add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS} ${JSRES})
 
 target_link_libraries(${EXECUTABLE} jsengine)
 target_link_libraries(${EXECUTABLE} devcore)

libjsconsole/JSConsole.cpp

@@ -36,8 +36,8 @@ using namespace dev;
 using namespace dev::eth;
 
 JSConsole::JSConsole(WebThreeDirect& _web3, std::vector<dev::KeyPair> const& _accounts):
-		m_engine(),
+	m_engine(),
-		m_printer(m_engine)
+	m_printer(m_engine)
 {
 	m_jsonrpcConnector.reset(new JSV8Connector(m_engine));
 	m_jsonrpcServer.reset(new WebThreeStubServer(*m_jsonrpcConnector.get(), _web3, _accounts));

libjsconsole/JSResources.cmake

@@ -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")
-

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);
 }

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);
 };
 
 }

libjsengine/JSEngine.h

@@ -37,6 +37,7 @@ public:
 	JSString(char const* _cstr);
 	~JSString();
 	char const* cstr() const { return m_cstr; }
+
 private:
 	char* m_cstr;
 };

libjsengine/JSPrinter.h

@@ -39,4 +39,3 @@ public:
 
 }
 }
-

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());
+	v8::String::Utf8Value exception(_tryCatch->Exception());
-	char const* exception_string = toCString(exception);
+	char const* exceptionString = toCString(exception);
-	v8::Handle<v8::Message> message = _try_catch->Message();
+	v8::Handle<v8::Message> 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);
+		char const* sourcelineString = toCString(sourceline);
-		printf("%s\n", sourceline_string);
+		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());
+		v8::String::Utf8Value stackTrace(_tryCatch->StackTrace());
-		if (stack_trace.length() > 0)
+		if (stackTrace.length() > 0)
 		{
-			char const* stack_trace_string = toCString(stack_trace);
+			char const* stackTraceString = toCString(stackTrace);
-			printf("%s\n", stack_trace_string);
+			printf("%s\n", stackTraceString);
 		}
 	}
 }

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<v8::Value> _value): m_value(_value) {}
 	JSString toString() const;
-
 	v8::Handle<v8::Value> const& value() const { return m_value; }
+
 private:
 	v8::Handle<v8::Value> m_value;
 };
 
-class JSV8Engine : public JSEngine<JSV8Value>
+class JSV8Engine: public JSEngine<JSV8Value>
 {
 public:
 	JSV8Engine();

libjsengine/JSV8Printer.h

@@ -30,7 +30,7 @@ namespace dev
 namespace eth
 {
 
-class JSV8Printer : public JSPrinter<JSV8Value>
+class JSV8Printer: public JSPrinter<JSV8Value>
 {
 public:
 	JSV8Printer(JSV8Engine const& _engine);

libjsengine/JSV8RPC.cpp

@@ -30,7 +30,7 @@ namespace dev
 namespace eth
 {
 
-v8::Handle<v8::Value> JSV8RPCSend(v8::Arguments const& args)
+v8::Handle<v8::Value> JSV8RPCSend(v8::Arguments const& _args)
 {
 	v8::Local<v8::String> JSON = v8::String::New("JSON");
 	v8::Local<v8::String> parse = v8::String::New("parse");
@@ -39,10 +39,10 @@ v8::Handle<v8::Value> JSV8RPCSend(v8::Arguments const& args)
 	v8::Handle<v8::Function> parseFunc = v8::Handle<v8::Function>::Cast(jsonObject->Get(parse));
 	v8::Handle<v8::Function> stringifyFunc = v8::Handle<v8::Function>::Cast(jsonObject->Get(stringify));
 
-	v8::Local<v8::Object> self = args.Holder();
+	v8::Local<v8::Object> self = _args.Holder();
 	v8::Local<v8::External> wrap = v8::Local<v8::External>::Cast(self->GetInternalField(0));
 	JSV8RPC* that = static_cast<JSV8RPC*>(wrap->Value());
-	v8::Local<v8::Value> vals[1] = {args[0]->ToObject()};
+	v8::Local<v8::Value> vals[1] = {_args[0]->ToObject()};
 	v8::Local<v8::Value> stringifiedArg = stringifyFunc->Call(stringifyFunc, 1, vals);
 	v8::String::Utf8Value str(stringifiedArg);
 	that->onSend(*str);
@@ -54,7 +54,7 @@ v8::Handle<v8::Value> 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<v8::ObjectTemplate> rpcTemplate = v8::ObjectTemplate::New();

libjsengine/JSV8RPC.h

@@ -33,14 +33,14 @@ class JSV8RPC
 {
 public:
 	JSV8RPC(JSV8Engine const& _engine);
-	virtual void onSend(const char* _payload) = 0;
+	virtual void onSend(char const* _payload) = 0;
-	const char* lastResponse() const { return m_lastResponse; }
+	char const* lastResponse() const { return m_lastResponse; }
 
 private:
 	JSV8Engine const& m_engine;
 
 protected:
-	const char* m_lastResponse;
+	char const* m_lastResponse;
 };
 
 }