Merge pull request #3650
2b45345
minor style cleanups (Philip Kaufmann)
This commit is contained in:
commit
acfe60677c
3 changed files with 11 additions and 11 deletions
|
@ -427,6 +427,7 @@ class CMerkleTx : public CTransaction
|
|||
{
|
||||
private:
|
||||
int GetDepthInMainChainINTERNAL(CBlockIndex* &pindexRet) const;
|
||||
|
||||
public:
|
||||
uint256 hashBlock;
|
||||
std::vector<uint256> vMerkleBranch;
|
||||
|
|
|
@ -15,8 +15,7 @@
|
|||
|
||||
BOOST_AUTO_TEST_SUITE(CheckBlock_tests)
|
||||
|
||||
bool
|
||||
read_block(const std::string& filename, CBlock& block)
|
||||
bool read_block(const std::string& filename, CBlock& block)
|
||||
{
|
||||
namespace fs = boost::filesystem;
|
||||
fs::path testFile = fs::current_path() / "data" / filename;
|
||||
|
|
Loading…
Reference in a new issue