Browse Source

common changes

cl-refactor
Marek Kotewicz 10 years ago
parent
commit
aa1a40a009
  1. 2
      libethereum/Client.cpp
  2. 2
      libweb3jsonrpc/WebThreeStubServerBase.cpp

2
libethereum/Client.cpp

@ -340,7 +340,6 @@ void Client::appendFromNewPending(TransactionReceipt const& _receipt, h256Hash&
{ {
Guard l(x_filtersWatches); Guard l(x_filtersWatches);
for (pair<h256 const, InstalledFilter>& i: m_filters) for (pair<h256 const, InstalledFilter>& i: m_filters)
if (isInBlockHashRange(i.second.filter.earliest(), i.second.filter.latest(), PendingBlockHash))
{ {
// acceptable number. // acceptable number.
auto m = i.second.filter.matches(_receipt); auto m = i.second.filter.matches(_receipt);
@ -362,7 +361,6 @@ void Client::appendFromNewBlock(h256 const& _block, h256Hash& io_changed)
Guard l(x_filtersWatches); Guard l(x_filtersWatches);
for (pair<h256 const, InstalledFilter>& i: m_filters) for (pair<h256 const, InstalledFilter>& i: m_filters)
if (isInBlockHashRange(i.second.filter.earliest(), i.second.filter.latest(), d.hash()) && i.second.filter.matches(d.logBloom))
// acceptable number & looks like block may contain a matching log entry. // acceptable number & looks like block may contain a matching log entry.
for (size_t j = 0; j < br.receipts.size(); j++) for (size_t j = 0; j < br.receipts.size(); j++)
{ {

2
libweb3jsonrpc/WebThreeStubServerBase.cpp

@ -172,7 +172,7 @@ static Json::Value toJson(dev::eth::LocalisedLogEntry const& _e)
for (auto const& t: _e.topics) for (auto const& t: _e.topics)
res["topics"].append(toJS(t)); res["topics"].append(toJS(t));
res["number"] = _e.number; res["number"] = _e.number;
res["hash"] = toJS(_e.transactionHash); res["transactionHash"] = toJS(_e.transactionHash);
} }
return res; return res;
} }

Loading…
Cancel
Save