Merge pull request ethereum#1884 from debris/libjsconsolefix

Gav Wood · Gav Wood · commit e89b3c06d5dc · 2015-05-13T18:43:41.000+03:00
libjsonconsole fix
diff --git a/eth/main.cpp b/eth/main.cpp
@@ -1797,7 +1797,7 @@ int main(int argc, char** argv)
 		if (useConsole)
 		{
 #if ETH_JSCONSOLE
-			JSConsole console(web3, vector<KeyPair>({sigKey}));
+			JSConsole console(web3, make_shared<SimpleAccountHolder>([&](){return web3.ethereum();}, getAccountPassword, keyManager));
 			while (!g_exit)
 			{
 				console.repl();
diff --git a/libjsconsole/JSConsole.cpp b/libjsconsole/JSConsole.cpp
@@ -25,7 +25,6 @@
 #include <libweb3jsonrpc/WebThreeStubServer.h>
 #include "JSConsole.h"
 #include "JSV8Connector.h"
-#include "libjsconsole/JSConsoleResources.hpp"
 
 // TODO! make readline optional!
 #include <readline/readline.h>
@@ -35,12 +34,12 @@ using namespace std;
 using namespace dev;
 using namespace dev::eth;
 
-JSConsole::JSConsole(WebThreeDirect& _web3, std::vector<dev::KeyPair> const& _accounts):
+JSConsole::JSConsole(WebThreeDirect& _web3, shared_ptr<AccountHolder> const& _accounts):
 	m_engine(),
 	m_printer(m_engine)
 {
 	m_jsonrpcConnector.reset(new JSV8Connector(m_engine));
-	m_jsonrpcServer.reset(new WebThreeStubServer(*m_jsonrpcConnector.get(), _web3, _accounts));
+	m_jsonrpcServer.reset(new WebThreeStubServer(*m_jsonrpcConnector.get(), _web3, _accounts, vector<KeyPair>()));
 }
 
 JSConsole::~JSConsole() {}
diff --git a/libjsconsole/JSConsole.h b/libjsconsole/JSConsole.h
@@ -33,10 +33,12 @@ namespace dev
 namespace eth
 {
 
+class AccountHolder;
+
 class JSConsole
 {
 public:
-	JSConsole(WebThreeDirect& _web3, std::vector<dev::KeyPair> const& _accounts);
+	JSConsole(WebThreeDirect& _web3, std::shared_ptr<AccountHolder> const& _accounts);
 	~JSConsole();
 	void repl() const;
 

Original file line number	Diff line number	Diff line change
`@@ -1797,7 +1797,7 @@ int main(int argc, char** argv)`
`1797`	`1797`	`if (useConsole)`
`1798`	`1798`	`{`
`1799`	`1799`	`#if ETH_JSCONSOLE`
`1800`		`- JSConsole console(web3, vector<KeyPair>({sigKey}));`
	`1800`	`+ JSConsole console(web3, make_shared<SimpleAccountHolder>([&](){return web3.ethereum();}, getAccountPassword, keyManager));`
`1801`	`1801`	`while (!g_exit)`
`1802`	`1802`	`{`
`1803`	`1803`	`console.repl();`
Original file line number	Diff line number	Diff line change
`@@ -33,10 +33,12 @@ namespace dev`
`33`	`33`	`namespace eth`
`34`	`34`	`{`
`35`	`35`
	`36`	`+class AccountHolder;`
	`37`	`+`
`36`	`38`	`class JSConsole`
`37`	`39`	`{`
`38`	`40`	`public:`
`39`		`- JSConsole(WebThreeDirect& _web3, std::vector<dev::KeyPair> const& _accounts);`
	`41`	`+ JSConsole(WebThreeDirect& _web3, std::shared_ptr<AccountHolder> const& _accounts);`
`40`	`42`	`~JSConsole();`
`41`	`43`	`void repl() const;`
`42`	`44`