diff --git a/src/ripple/app/rdb/Wallet.h b/src/ripple/app/rdb/Wallet.h index 194ff97c8..643562c2a 100644 --- a/src/ripple/app/rdb/Wallet.h +++ b/src/ripple/app/rdb/Wallet.h @@ -47,9 +47,7 @@ makeWalletDB(DatabaseCon::Setup const& setup); * @return Unique pointer to the database descriptor. */ std::unique_ptr -makeTestWalletDB( - DatabaseCon::Setup const& setup, - std::string const& dbname); +makeTestWalletDB(DatabaseCon::Setup const& setup, std::string const& dbname); /** * @brief getManifests Loads a manifest from the wallet database and stores it diff --git a/src/ripple/app/rdb/backend/detail/impl/Node.cpp b/src/ripple/app/rdb/backend/detail/impl/Node.cpp index 4910c922a..4b1a8ab85 100644 --- a/src/ripple/app/rdb/backend/detail/impl/Node.cpp +++ b/src/ripple/app/rdb/backend/detail/impl/Node.cpp @@ -601,8 +601,7 @@ saveSQLValidatedLedger( assert(false); } - if (ledger->info().accountHash != - ledger->stateMap().getHash().as_uint256()) + if (ledger->info().accountHash != ledger->stateMap().getHash().as_uint256()) { JLOG(j.fatal()) << "sAL: " << ledger->info().accountHash << " != " << ledger->stateMap().getHash(); diff --git a/src/ripple/core/Config.h b/src/ripple/core/Config.h index 4e519ac6e..de6aff52e 100644 --- a/src/ripple/core/Config.h +++ b/src/ripple/core/Config.h @@ -169,7 +169,7 @@ class Config : public BasicConfig std::string START_LEDGER; - uint32_t RELATIONAL_DB = 0; // 0 == SQLite, 1 == LMDB + uint32_t RELATIONAL_DB = 0; // 0 == SQLite, 1 == LMDB // Network parameters uint32_t NETWORK_ID = 0; diff --git a/src/ripple/core/DatabaseCon.h b/src/ripple/core/DatabaseCon.h index 24801c47e..6bfd6cf94 100644 --- a/src/ripple/core/DatabaseCon.h +++ b/src/ripple/core/DatabaseCon.h @@ -73,7 +73,8 @@ class LockedLmdbSession { return env_.get(); } - explicit operator bool() const + explicit + operator bool() const { return bool(env_); } diff --git a/src/ripple/core/impl/DatabaseCon.cpp b/src/ripple/core/impl/DatabaseCon.cpp index 5e5a68ae4..8b8ab193b 100644 --- a/src/ripple/core/impl/DatabaseCon.cpp +++ b/src/ripple/core/impl/DatabaseCon.cpp @@ -252,7 +252,6 @@ setup_DatabaseCon(Config const& c, std::optional j) }(); } - setup.useGlobalPragma = true; return setup;