Browse Source

More style fixes

cl-refactor
Lefteris Karapetsas 10 years ago
parent
commit
3874c78d06
  1. 12
      libdevcore/StructuredLogger.cpp
  2. 3
      libethereum/BlockChain.cpp
  3. 3
      libp2p/Host.cpp
  4. 3
      libp2p/Host.h
  5. 2
      libwebthree/WebThree.h

12
libdevcore/StructuredLogger.cpp

@ -80,7 +80,8 @@ void StructuredLogger::stopping(string const& _clientImpl, const char* _ethVersi
}
}
void StructuredLogger::p2pConnected(string const& _id,
void StructuredLogger::p2pConnected(
string const& _id,
bi::tcp::endpoint const& _addr,
chrono::system_clock::time_point const& _ts,
string const& _remoteVersion,
@ -117,7 +118,8 @@ void StructuredLogger::p2pDisconnected(string const& _id, bi::tcp::endpoint cons
}
}
void StructuredLogger::minedNewBlock(string const& _hash,
void StructuredLogger::minedNewBlock(
string const& _hash,
string const& _blockNumber,
string const& _chainHeadHash,
string const& _prevHash)
@ -135,7 +137,8 @@ void StructuredLogger::minedNewBlock(string const& _hash,
}
}
void StructuredLogger::chainReceivedNewBlock(string const& _hash,
void StructuredLogger::chainReceivedNewBlock(
string const& _hash,
string const& _blockNumber,
string const& _chainHeadHash,
string const& _remoteID,
@ -155,7 +158,8 @@ void StructuredLogger::chainReceivedNewBlock(string const& _hash,
}
}
void StructuredLogger::chainNewHead(string const& _hash,
void StructuredLogger::chainNewHead(
string const& _hash,
string const& _blockNumber,
string const& _chainHeadHash,
string const& _prevHash)

3
libethereum/BlockChain.cpp

@ -323,7 +323,8 @@ h256s BlockChain::import(bytes const& _block, OverlayDB const& _db)
bi.nonce.abridged(),
currentHash().abridged(),
"", // TODO: remote id ??
bi.parentHash.abridged());
bi.parentHash.abridged()
);
// cnote << "Parent " << bi.parentHash << " has " << details(bi.parentHash).children.size() << " children.";
h256s ret;

3
libp2p/Host.cpp

@ -164,7 +164,8 @@ void Host::registerPeer(std::shared_ptr<Session> _s, CapDescs const& _caps)
_s->m_peer->peerEndpoint(),
_s->m_peer->m_lastConnected,
_s->m_info.clientVersion,
peerCount());
peerCount()
);
RecursiveGuard l(x_sessions);
// TODO: temporary loose-coupling; if m_peers already has peer,
// it is same as _s->m_peer. (fixing next PR)

3
libp2p/Host.h

@ -85,7 +85,8 @@ class Host: public Worker
public:
/// Start server, listening for connections on the given port.
Host(std::string const& _clientVersion,
Host(
std::string const& _clientVersion,
NetworkPreferences const& _n = NetworkPreferences(),
bytesConstRef _restoreNetwork = bytesConstRef()
);

2
libwebthree/WebThree.h

@ -105,7 +105,7 @@ public:
/// ethereum() may be safely static_cast()ed to a eth::Client*.
WebThreeDirect(
std::string const& _clientVersion,
std::string const& _dbPath,
std::string const& _dbPath,
bool _forceClean = false,
std::set<std::string> const& _interfaces = {"eth", "shh"},
p2p::NetworkPreferences const& _n = p2p::NetworkPreferences(),

Loading…
Cancel
Save