From f6c9603a6ba94359b129c79839c19b4d515d3d98 Mon Sep 17 00:00:00 2001 From: yann300 Date: Mon, 20 Jul 2015 11:59:59 +0200 Subject: [PATCH] small changes --- mix/ClientModel.cpp | 2 +- mix/ClientModel.h | 2 +- mix/MixClient.cpp | 2 +- mix/MixClient.h | 2 +- mix/qml/BlockChain.qml | 3 +-- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/mix/ClientModel.cpp b/mix/ClientModel.cpp index c6cc05722..7e4aefc67 100644 --- a/mix/ClientModel.cpp +++ b/mix/ClientModel.cpp @@ -302,7 +302,7 @@ void ClientModel::finalizeBlock() } } -TransactionSettings ClientModel::transaction(QVariant _tr) +TransactionSettings ClientModel::transaction(QVariant const& _tr) const { QVariantMap transaction = _tr.toMap(); QString contractId = transaction.value("contractId").toString(); diff --git a/mix/ClientModel.h b/mix/ClientModel.h index 4a367f9ba..bf88ad66a 100644 --- a/mix/ClientModel.h +++ b/mix/ClientModel.h @@ -270,7 +270,7 @@ private: void finalizeBlock(); void stopExecution(); void setupExecutionChain(); - TransactionSettings transaction(QVariant _tr); + TransactionSettings transaction(QVariant const& _tr) const; std::atomic m_running; std::atomic m_mining; diff --git a/mix/MixClient.cpp b/mix/MixClient.cpp index 72cc194ff..dd571d83d 100644 --- a/mix/MixClient.cpp +++ b/mix/MixClient.cpp @@ -123,7 +123,7 @@ Transaction MixClient::replaceGas(Transaction const& _t, u256 const& _gas, Secre return ret; } -ExecutionResult MixClient::debugTransaction(Transaction const& _t, State const& _state, LastHashes _lastHashes, bool _call) +ExecutionResult MixClient::debugTransaction(Transaction const& _t, State const& _state, LastHashes const& _lastHashes, bool _call) { State execState = _state; execState.addBalance(_t.sender(), _t.gas() * _t.gasPrice()); //give it enough balance for gas estimation diff --git a/mix/MixClient.h b/mix/MixClient.h index 75f45efbf..715ab4d4e 100644 --- a/mix/MixClient.h +++ b/mix/MixClient.h @@ -61,7 +61,7 @@ public: virtual std::pair submitTransaction(eth::TransactionSkeleton const& _ts, Secret const& _secret) override { return submitTransaction(_ts, _secret, false); } std::pair submitTransaction(eth::TransactionSkeleton const& _ts, Secret const& _secret, bool _gasAuto); dev::eth::ExecutionResult call(Address const& _secret, u256 _value, Address _dest, bytes const& _data, u256 _gas, u256 _gasPrice, eth::BlockNumber _blockNumber, bool _gasAuto, eth::FudgeFactor _ff = eth::FudgeFactor::Strict); - ExecutionResult debugTransaction(dev::eth::Transaction const& _t, eth:: State const& _state, eth::LastHashes _lastHashes, bool _call); + ExecutionResult debugTransaction(dev::eth::Transaction const& _t, eth:: State const& _state, eth::LastHashes const& _lastHashes, bool _call); void setAddress(Address _us) override; void startMining() override; void stopMining() override; diff --git a/mix/qml/BlockChain.qml b/mix/qml/BlockChain.qml index b6b5e3403..1b1b68862 100644 --- a/mix/qml/BlockChain.qml +++ b/mix/qml/BlockChain.qml @@ -330,10 +330,9 @@ ColumnLayout { for (var c in blinkReasons) { if (blinkReasons[c] === reason) - { return true - } } + return false }