cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into develop

Browse Source
This commit is contained in:
Christoph Jentzsch 2014-09-20 02:05:46 +02:00
commit e2fe9628d1
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
TestHelper.cpp
View File

@ -42,11 +42,14 @@ void mine(Client& c, int numBlocks)
void connectClients(Client& c1, Client& c2) void connectClients(Client& c1, Client& c2)
{ {
// TODO: Move to WebThree. eth::Client no longer handles networking.
#if 0
short c1Port = 20000; short c1Port = 20000;
short c2Port = 21000; short c2Port = 21000;
c1.startNetwork(c1Port); c1.startNetwork(c1Port);
c2.startNetwork(c2Port); c2.startNetwork(c2Port);
c2.connect("127.0.0.1", c1Port); c2.connect("127.0.0.1", c1Port);
#endif
} }
} }

2
peer.cpp
View File

@ -46,7 +46,7 @@ int peerTest(int argc, char** argv)
remoteHost = argv[i]; remoteHost = argv[i];
} }
Host ph("Test", listenPort); Host ph("Test", NetworkPreferences(listenPort));
if (!remoteHost.empty()) if (!remoteHost.empty())
ph.connect(remoteHost, remotePort); ph.connect(remoteHost, remotePort);