Cosmetic fix (#483)

Mikhail Tagirov · web-flow · commit 11af63099d9d · 2021-10-17T00:52:03.000+03:00
Signed-off-by: Mikhail Tagirov &lt;dev.mikhail.tagirov@gmail.com&gt;
diff --git a/core/blockchain/block_validator/impl/block_validator_impl.cpp b/core/blockchain/block_validator/impl/block_validator_impl.cpp
@@ -14,8 +14,8 @@
 namespace fc::blockchain::block_validator {
   using primitives::address::Protocol;
   using storage::amt::Amt;
-  using SignedMessage = vm::message::SignedMessage;
-  using UnsignedMessage = vm::message::UnsignedMessage;
+  using vm::message::SignedMessage;
+  using vm::message::UnsignedMessage;
   using BlsCryptoSignature = crypto::bls::Signature;
   using BlsCryptoPubKey = crypto::bls::PublicKey;
   using SecpCryptoSignature = crypto::secp256k1::Signature;
@@ -147,7 +147,7 @@ namespace fc::blockchain::block_validator {
     return ValidatorError::kInvalidParentState;
   }
 
-  outcome::result<std::reference_wrapper<BlockValidatorImpl::TipsetCPtr>>
+  outcome::result<std::reference_wrapper<TipsetCPtr>>
   BlockValidatorImpl::getParentTipset(const BlockHeader &block) const {
     auto cid{primitives::cid::getCidOfCbor(block).value()};
     if (parent_tipset_cache_ && parent_tipset_cache_.value().first == cid) {
diff --git a/core/blockchain/block_validator/impl/block_validator_impl.hpp b/core/blockchain/block_validator/impl/block_validator_impl.hpp
@@ -21,21 +21,19 @@
 #include "vm/interpreter/interpreter.hpp"
 
 namespace fc::blockchain::block_validator {
+  using scenarios::Stage;
+  using storage::ipfs::IpfsDatastore;
+  using EpochClock = clock::ChainEpochClock;
+  using blockchain::weight::WeightCalculator;
+  using clock::UTCClock;
+  using crypto::bls::BlsProvider;
+  using power::PowerTable;
+  using SecpProvider = crypto::secp256k1::Secp256k1ProviderDefault;
+  using primitives::tipset::Tipset;
+  using primitives::tipset::TipsetCPtr;
+  using vm::interpreter::InterpreterCache;
 
   class BlockValidatorImpl : public BlockValidator {
-   protected:
-    using Stage = scenarios::Stage;
-    using IpfsDatastore = storage::ipfs::IpfsDatastore;
-    using EpochClock = clock::ChainEpochClock;
-    using UTCClock = clock::UTCClock;
-    using WeightCalculator = blockchain::weight::WeightCalculator;
-    using PowerTable = power::PowerTable;
-    using BlsProvider = crypto::bls::BlsProvider;
-    using SecpProvider = crypto::secp256k1::Secp256k1ProviderDefault;
-    using InterpreterCache = vm::interpreter::InterpreterCache;
-    using Tipset = primitives::tipset::Tipset;
-    using TipsetCPtr = primitives::tipset::TipsetCPtr;
-
    public:
     using StageExecutor = outcome::result<void> (BlockValidatorImpl::*)(
         const BlockHeader &) const;
diff --git a/core/blockchain/block_validator/impl/syntax_rules.hpp b/core/blockchain/block_validator/impl/syntax_rules.hpp
@@ -9,13 +9,12 @@
 #include "primitives/block/block.hpp"
 
 namespace fc::blockchain::block_validator {
+  using primitives::block::BlockHeader;
+
   /**
    * @class Validating block header syntax
    */
   class SyntaxRules {
-   protected:
-    using BlockHeader = primitives::block::BlockHeader;
-
    public:
     /**
      * @brief Check parents count
diff --git a/core/node/receive_hello.hpp b/core/node/receive_hello.hpp
@@ -15,11 +15,10 @@
 
 namespace fc::sync {
   using common::libp2p::CborStream;
+  using libp2p::peer::PeerId;
 
   class ReceiveHello : public std::enable_shared_from_this<ReceiveHello> {
    public:
-    using PeerId = libp2p::peer::PeerId;
-
     ReceiveHello(std::shared_ptr<libp2p::Host> host,
                  std::shared_ptr<clock::UTCClock> clock,
                  CID genesis,
diff --git a/core/node/say_hello.hpp b/core/node/say_hello.hpp
@@ -22,11 +22,10 @@
 namespace fc::sync {
   using common::libp2p::CborStream;
   using libp2p::basic::Scheduler;
+  using libp2p::peer::PeerId;
 
   class SayHello : public std::enable_shared_from_this<SayHello> {
    public:
-    using PeerId = libp2p::peer::PeerId;
-
     SayHello(std::shared_ptr<libp2p::Host> host,
              std::shared_ptr<Scheduler> scheduler,
              std::shared_ptr<clock::UTCClock> clock);
diff --git a/core/primitives/resources/resources.hpp b/core/primitives/resources/resources.hpp
@@ -12,8 +12,7 @@
 #include "primitives/sector/sector.hpp"
 
 namespace fc::primitives {
-
-  using fc::primitives::sector::RegisteredSealProof;
+  using sector::RegisteredSealProof;
 
   struct Resources {
     uint64_t min_memory;  // What Must be in RAM for decent perf
diff --git a/core/sector_storage/impl/manager_impl.cpp b/core/sector_storage/impl/manager_impl.cpp
@@ -24,8 +24,8 @@
 #include "sector_storage/stores/store_error.hpp"
 
 namespace fc::sector_storage {
-  using fc::primitives::sector_file::SectorFileType;
-  using fc::primitives::sector_file::sectorName;
+  using primitives::sector_file::SectorFileType;
+  using primitives::sector_file::sectorName;
   namespace fs = boost::filesystem;
 
   WorkerAction schedFetch(const SectorRef &sector,
diff --git a/core/sector_storage/stores/impl/index_impl.cpp b/core/sector_storage/stores/impl/index_impl.cpp
@@ -12,8 +12,7 @@
 #include "primitives/types.hpp"
 
 namespace fc::sector_storage::stores {
-
-  using fc::common::HttpUri;
+  using common::HttpUri;
   using primitives::BigInt;
   using primitives::sector_file::sectorName;
   using std::chrono::duration_cast;
diff --git a/core/sector_storage/stores/impl/local_store.cpp b/core/sector_storage/stores/impl/local_store.cpp
@@ -22,11 +22,10 @@
 #include "sector_storage/stores/storage_error.hpp"
 #include "sector_storage/stores/store_error.hpp"
 
-using fc::primitives::LocalStorageMeta;
-using fc::primitives::sector_file::kSectorFileTypes;
-using std::chrono::duration_cast;
-
 namespace fc::sector_storage::stores {
+  using primitives::LocalStorageMeta;
+  using primitives::sector_file::kSectorFileTypes;
+  using std::chrono::duration_cast;
   namespace fs = boost::filesystem;
 
   outcome::result<SectorId> parseSectorId(const std::string &filename) {
diff --git a/core/sector_storage/stores/index.hpp b/core/sector_storage/stores/index.hpp
@@ -12,20 +12,19 @@
 #include "primitives/types.hpp"
 
 namespace fc::sector_storage::stores {
+  using primitives::FsStat;
+  using primitives::SectorSize;
+  using primitives::StorageID;
   using primitives::sector::RegisteredSealProof;
+  using primitives::sector::SectorId;
+  using primitives::sector_file::SectorFileType;
+  using std::chrono::system_clock;
 
   class WLock {
    public:
     virtual ~WLock() = default;
   };
 
-  using fc::primitives::sector::SectorId;
-  using fc::primitives::sector_file::SectorFileType;
-  using primitives::FsStat;
-  using primitives::SectorSize;
-  using primitives::StorageID;
-  using std::chrono::system_clock;
-
   const std::chrono::seconds kHeartbeatInterval(10);
   const std::chrono::seconds kSkippedHeartbeatThreshold =
       kHeartbeatInterval * 5;
diff --git a/core/storage/filestore/impl/filesystem/filesystem_filestore.cpp b/core/storage/filestore/impl/filesystem/filesystem_filestore.cpp
@@ -8,12 +8,6 @@
 #include "storage/filestore/filestore_error.hpp"
 #include "storage/filestore/impl/filesystem/filesystem_file.hpp"
 
-using fc::storage::filestore::File;
-using fc::storage::filestore::FileStoreError;
-using fc::storage::filestore::FileSystemFile;
-using fc::storage::filestore::FileSystemFileStore;
-using fc::storage::filestore::Path;
-
 namespace fc::storage::filestore {
 
   outcome::result<bool> FileSystemFileStore::exists(
diff --git a/core/storage/in_memory/in_memory_batch.hpp b/core/storage/in_memory/in_memory_batch.hpp
@@ -9,7 +9,7 @@
 #include "storage/in_memory/in_memory_storage.hpp"
 
 namespace fc::storage {
-  using fc::common::Buffer;
+  using common::Buffer;
 
   class InMemoryBatch : public fc::storage::face::WriteBatch<Buffer, Buffer> {
    public:
diff --git a/core/storage/in_memory/in_memory_storage.cpp b/core/storage/in_memory/in_memory_storage.cpp
@@ -8,9 +8,8 @@
 #include "storage/in_memory/in_memory_batch.hpp"
 #include "storage/in_memory/in_memory_cursor.hpp"
 
-using fc::common::Buffer;
-
 namespace fc::storage {
+  using common::Buffer;
 
   outcome::result<Buffer> InMemoryStorage::get(const Buffer &key) const {
     if (storage.find(key.toHex()) != storage.end()) {
diff --git a/core/storage/in_memory/in_memory_storage.hpp b/core/storage/in_memory/in_memory_storage.hpp
@@ -12,8 +12,8 @@
 #include "storage/buffer_map.hpp"
 
 namespace fc::storage {
+  using common::Buffer;
 
-  using fc::common::Buffer;
   /**
    * Simple storage that conforms PersistentMap interface
    * Mostly needed to have an in-memory trie in tests to avoid integration with
diff --git a/core/vm/actor/actor.hpp b/core/vm/actor/actor.hpp
@@ -15,7 +15,7 @@
 #include "vm/version/version.hpp"
 
 namespace fc::vm::actor {
-  using fc::common::Buffer;
+  using common::Buffer;
   using primitives::BigInt;
   using primitives::Nonce;
   using primitives::TokenAmount;
diff --git a/core/vm/actor/builtin/states/multisig/multisig_actor_state.cpp b/core/vm/actor/builtin/states/multisig/multisig_actor_state.cpp
@@ -8,7 +8,7 @@
 #include "vm/runtime/runtime.hpp"
 
 namespace fc::vm::actor::builtin::states {
-  using fc::vm::runtime::Runtime;
+  using runtime::Runtime;
 
   void MultisigActorState::setLocked(const ChainEpoch &start_epoch,
                                      const EpochDuration &unlock_duration,
diff --git a/core/vm/actor/builtin/states/storage_power/storage_power_actor_state.cpp b/core/vm/actor/builtin/states/storage_power/storage_power_actor_state.cpp
@@ -15,9 +15,9 @@ namespace fc::vm::actor::builtin::states {
   using adt::Multimap;
   using common::math::kPrecision128;
   using common::smoothing::nextEstimate;
-  using fc::vm::runtime::Runtime;
   using primitives::BigInt;
   using primitives::kChainEpochUndefined;
+  using runtime::Runtime;
 
   /** genesis power in bytes = 750,000 GiB */
   static const BigInt kInitialQAPowerEstimatePosition =
diff --git a/core/vm/actor/builtin/types/multisig/transaction.cpp b/core/vm/actor/builtin/types/multisig/transaction.cpp
@@ -8,7 +8,7 @@
 #include "vm/runtime/runtime.hpp"
 
 namespace fc::vm::actor::builtin::types::multisig {
-  using fc::vm::runtime::Runtime;
+  using runtime::Runtime;
 
   outcome::result<Buffer> Transaction::hash(Runtime &runtime) const {
     ProposalHashData hash_data(*this);
diff --git a/core/vm/interpreter/impl/interpreter_impl.hpp b/core/vm/interpreter/impl/interpreter_impl.hpp
@@ -12,6 +12,7 @@
 
 namespace fc::vm::interpreter {
   using blockchain::weight::WeightCalculator;
+  using primitives::block::BlockHeader;
   using runtime::EnvironmentContext;
   using runtime::MessageReceipt;
 
@@ -27,9 +28,6 @@ namespace fc::vm::interpreter {
         const TipsetCPtr &tipset,
         std::vector<MessageReceipt> *all_receipts) const;
 
-   protected:
-    using BlockHeader = primitives::block::BlockHeader;
-
    private:
     bool hasDuplicateMiners(const std::vector<BlockHeader> &blocks) const;
     outcome::result<BigInt> getWeight(const TipsetCPtr &tipset) const;
diff --git a/core/vm/interpreter/interpreter.hpp b/core/vm/interpreter/interpreter.hpp
@@ -13,6 +13,7 @@
 
 namespace fc::vm::interpreter {
   using primitives::BigInt;
+  using primitives::tipset::TipsetCPtr;
   using storage::PersistentBufferMap;
 
   enum class InterpreterError {
@@ -57,9 +58,6 @@ namespace fc::vm::interpreter {
   };
 
   class Interpreter {
-   protected:
-    using TipsetCPtr = primitives::tipset::TipsetCPtr;
-
    public:
     virtual ~Interpreter() = default;
 
diff --git a/test/core/blockchain/validation/block_validator_test.cpp b/test/core/blockchain/validation/block_validator_test.cpp
@@ -15,7 +15,6 @@
 #include "testutil/mocks/crypto/bls/bls_provider_mock.hpp"
 #include "testutil/mocks/crypto/secp256k1/secp256k1_provider_mock.hpp"
 #include "testutil/mocks/storage/ipfs/ipfs_datastore_mock.hpp"
-#include "testutil/mocks/vm/interpreter/interpreter_mock.hpp"
 #include "testutil/outcome.hpp"
 
 namespace config {
@@ -28,17 +27,16 @@ namespace config {
 
 namespace fc::blockchain::block_validator {
   using DataStore = storage::ipfs::MockIpfsDatastore;
-  using EpochClock = clock::ChainEpochClockImpl;
-  using WeightCalculator = weight::WeightCalculatorMock;
-  using PowerTable = power::PowerTableImpl;
-  using BlsProvider = crypto::bls::BlsProviderMock;
-  using Secp256k1Provider = crypto::secp256k1::Secp256k1ProviderMock;
-  using Interpreter = vm::interpreter::InterpreterMock;
+  using EpochClockImpl = clock::ChainEpochClockImpl;
+  using crypto::bls::BlsProviderMock;
+  using crypto::secp256k1::Secp256k1ProviderMock;
   using crypto::signature::Secp256k1Signature;
   using crypto::signature::Signature;
+  using power::PowerTableImpl;
   using primitives::address::Address;
   using primitives::block::BlockHeader;
   using primitives::block::Ticket;
+  using weight::WeightCalculatorMock;
 
   class BlockValidatorTest : public testing::Test {
    protected:
@@ -49,15 +47,15 @@ namespace fc::blockchain::block_validator {
     std::shared_ptr<BlockValidator> createValidator() {
       auto datastore = std::make_shared<DataStore>();
       auto utc_clock = std::make_shared<fc::clock::UTCClockMock>();
-      auto epoch_clock =
-          std::make_shared<EpochClock>(fc::clock::Time{config::kGenesisTime});
-      auto weight_calculator = std::make_shared<WeightCalculator>();
-      auto power_table = std::make_shared<PowerTable>();
+      auto epoch_clock = std::make_shared<EpochClockImpl>(
+          fc::clock::Time{config::kGenesisTime});
+      auto weight_calculator = std::make_shared<WeightCalculatorMock>();
+      auto power_table = std::make_shared<PowerTableImpl>();
       auto result = power_table->setMinerPower(
           Address::makeFromId(config::kMinerId), config::kMinerPower);
       BOOST_ASSERT(!result.has_error());
-      auto bls_provider = std::make_shared<BlsProvider>();
-      auto secp_provider = std::make_shared<Secp256k1Provider>();
+      auto bls_provider = std::make_shared<BlsProviderMock>();
+      auto secp_provider = std::make_shared<Secp256k1ProviderMock>();
       return std::make_shared<BlockValidatorImpl>(datastore,
                                                   utc_clock,
                                                   epoch_clock,
@@ -78,7 +76,7 @@ namespace fc::blockchain::block_validator {
               }},
               {fc::primitives::sector::PoStProof{
                   fc::primitives::sector::RegisteredPoStProof::
-                  kStackedDRG2KiBWinningPoSt,
+                      kStackedDRG2KiBWinningPoSt,
                   "F00D"_unhex,
               }},
               {fc::CbCid::hash("01"_unhex)},
