refactor test outcome

cmake/Hunter/hunter-gate-url.cmake

@@ -1,5 +1,5 @@
 HunterGate(
-  URL  https://github.com/qdrvm/hunter/archive/refs/tags/v0.25.3-qdrvm19.zip
-  SHA1 eed8b8333c14f25176d4af4fb26256981fd1b527
+  URL  https://github.com/qdrvm/hunter/archive/refs/tags/v0.25.3-qdrvm21.zip
+  SHA1 5b52ab9a309771f172ca609a46e26dde60a8edd7
   LOCAL
-)
+)

core/api/jrpc/value_converter.hpp

@@ -11,6 +11,7 @@
 #include <jsonrpc-lean/value.h>
 #include <boost/range/adaptor/transformed.hpp>
 
+#include <scale/scale.hpp>
 #include "api/service/state/state_api.hpp"
 #include "common/blob.hpp"
 #include "common/hexutil.hpp"
@@ -24,7 +25,6 @@
 #include "primitives/rpc_methods.hpp"
 #include "primitives/runtime_dispatch_info.hpp"
 #include "primitives/version.hpp"
-#include "scale/scale.hpp"
 
 namespace kagome::api {
 

core/api/service/author/impl/author_api_impl.cpp

@@ -11,6 +11,7 @@
 #include <boost/system/error_code.hpp>
 #include <stdexcept>
 
+#include <scale/scale_decoder_stream.hpp>
 #include "api/service/api_service.hpp"
 #include "blockchain/block_tree.hpp"
 #include "crypto/hasher.hpp"
@@ -20,7 +21,6 @@
 #include "crypto/sr25519_types.hpp"
 #include "primitives/transaction.hpp"
 #include "runtime/runtime_api/session_keys_api.hpp"
-#include "scale/scale_decoder_stream.hpp"
 #include "subscription/subscriber.hpp"
 #include "transaction_pool/transaction_pool.hpp"
 

core/api/service/child_state/requests/get_keys.cpp

@@ -6,7 +6,7 @@
 
 #include "api/service/child_state/requests/get_keys.hpp"
 
-#include "scale/scale.hpp"
+#include <scale/scale.hpp>
 
 namespace kagome::api::child_state::request {
 

core/api/service/child_state/requests/get_keys_paged.cpp

@@ -6,7 +6,7 @@
 
 #include "api/service/child_state/requests/get_keys_paged.hpp"
 
-#include "scale/scale.hpp"
+#include <scale/scale.hpp>
 
 namespace kagome::api::child_state::request {
 

core/api/service/payment/impl/payment_api_impl.cpp

@@ -6,9 +6,9 @@
 
 #include "api/service/payment/impl/payment_api_impl.hpp"
 
+#include <scale/types.hpp>
 #include "blockchain/block_tree.hpp"
 #include "runtime/runtime_api/transaction_payment_api.hpp"
-#include "scale/types.hpp"
 
 namespace kagome::api {
 

core/api/service/state/requests/call.cpp

@@ -6,7 +6,7 @@
 
 #include "api/service/state/requests/call.hpp"
 
-#include "scale/scale.hpp"
+#include <scale/scale.hpp>
 
 namespace kagome::api::state::request {
 

core/api/service/state/requests/get_keys_paged.cpp

@@ -6,7 +6,7 @@
 
 #include "api/service/state/requests/get_keys_paged.hpp"
 
-#include "scale/scale.hpp"
+#include <scale/scale.hpp>
 
 namespace kagome::api::state::request {
 

core/api/service/system/impl/system_api_impl.cpp

@@ -10,9 +10,9 @@
 
 #include <jsonrpc-lean/request.h>
 
+#include <scale/scale.hpp>
 #include "blockchain/block_tree.hpp"
 #include "primitives/ss58_codec.hpp"
-#include "scale/scale.hpp"
 #include "transaction_pool/transaction_pool.hpp"
 
 namespace kagome::api {

core/api/service/system/requests/peers.hpp

@@ -8,11 +8,11 @@
 
 #include "api/service/base_request.hpp"
 
-#include "account_next_index.hpp"
+#include "api/service/system/requests/account_next_index.hpp"
+#include "api/service/system/requests/chain.hpp"
+#include "api/service/system/requests/chain_type.hpp"
+#include "api/service/system/requests/health.hpp"
 #include "api/service/system/system_api.hpp"
-#include "chain.hpp"
-#include "chain_type.hpp"
-#include "health.hpp"
 
 namespace kagome::api::system::request {
 

core/application/impl/app_configuration_impl.cpp

@@ -24,9 +24,9 @@
 
 #include "api/transport/tuner.hpp"
 #include "application/build_version.hpp"
+#include "application/impl/chain_spec_impl.hpp"
 #include "assets/assets.hpp"
 #include "assets/embedded_chainspec.hpp"
-#include "chain_spec_impl.hpp"
 #include "common/hexutil.hpp"
 #include "common/uri.hpp"
 #include "filesystem/common.hpp"

core/blockchain/impl/block_header_repository_impl.cpp

@@ -8,9 +8,9 @@
 
 #include <optional>
 
+#include <scale/scale.hpp>
 #include "blockchain/block_tree_error.hpp"
 #include "blockchain/impl/storage_util.hpp"
-#include "scale/scale.hpp"
 
 using kagome::primitives::BlockHash;
 using kagome::primitives::BlockNumber;

core/blockchain/impl/block_storage_impl.cpp

@@ -6,10 +6,10 @@
 
 #include "blockchain/impl/block_storage_impl.hpp"
 
+#include <scale/scale.hpp>
 #include "blockchain/block_storage_error.hpp"
 #include "blockchain/impl/storage_util.hpp"
 #include "common/visitor.hpp"
-#include "scale/scale.hpp"
 
 namespace kagome::blockchain {
   using primitives::Block;

core/consensus/babe/impl/babe_block_validator_impl.cpp

@@ -12,18 +12,18 @@
 #include "consensus/babe/babe_config_repository.hpp"
 #include "consensus/babe/babe_lottery.hpp"
 #include "consensus/babe/impl/babe_digests_util.hpp"
+#include "consensus/babe/impl/prepare_transcript.hpp"
+#include "consensus/babe/impl/threshold_util.hpp"
 #include "consensus/babe/types/seal.hpp"
 #include "consensus/timeline/impl/slot_leadership_error.hpp"
 #include "consensus/timeline/slots_util.hpp"
 #include "crypto/sr25519_provider.hpp"
 #include "crypto/vrf_provider.hpp"
 #include "metrics/histogram_timer.hpp"
-#include "prepare_transcript.hpp"
 #include "primitives/inherent_data.hpp"
 #include "primitives/transcript.hpp"
 #include "runtime/runtime_api/babe_api.hpp"
 #include "runtime/runtime_api/offchain_worker_api.hpp"
-#include "threshold_util.hpp"
 
 OUTCOME_CPP_DEFINE_CATEGORY(kagome::consensus::babe,
                             BabeBlockValidatorImpl::ValidationError,

core/consensus/babe/impl/babe_config_repository_impl.cpp

@@ -4,19 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "babe_config_repository_impl.hpp"
+#include "consensus/babe/impl/babe_config_repository_impl.hpp"
 
 #include "application/app_configuration.hpp"
 #include "application/app_state_manager.hpp"
-#include "babe.hpp"
-#include "babe_digests_util.hpp"
 #include "blockchain/block_header_repository.hpp"
 #include "blockchain/block_tree.hpp"
+#include "consensus/babe/impl/babe.hpp"
+#include "consensus/babe/impl/babe_digests_util.hpp"
 #include "consensus/consensus_selector.hpp"
 #include "consensus/timeline/slots_util.hpp"
 #include "primitives/block_header.hpp"
 #include "runtime/runtime_api/babe_api.hpp"
-#include "scale/scale.hpp"
 #include "storage/map_prefix/prefix.hpp"
 #include "storage/predefined_keys.hpp"
 #include "storage/trie/trie_storage.hpp"

core/consensus/babe/impl/babe_digests_util.cpp

@@ -6,7 +6,7 @@
 
 #include "consensus/babe/impl/babe_digests_util.hpp"
 
-#include "scale/scale.hpp"
+#include <scale/scale.hpp>
 
 OUTCOME_CPP_DEFINE_CATEGORY(kagome::consensus::babe, DigestError, e) {
   using E = kagome::consensus::babe::DigestError;

core/consensus/grandpa/authority_manager_error.cpp

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "authority_manager_error.hpp"
+#include "consensus/grandpa/authority_manager_error.hpp"
 
 OUTCOME_CPP_DEFINE_CATEGORY(kagome::consensus::grandpa,
                             AuthorityManagerError,

core/consensus/grandpa/impl/authority_manager_impl.cpp

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "authority_manager_impl.hpp"
+#include "consensus/grandpa/impl/authority_manager_impl.hpp"
 
 #include "application/app_state_manager.hpp"
 #include "blockchain/block_tree.hpp"

core/consensus/grandpa/impl/environment_impl.cpp

@@ -12,6 +12,7 @@
 #include <boost/optional/optional_io.hpp>
 #include <libp2p/common/final_action.hpp>
 
+#include <scale/scale.hpp>
 #include "application/app_state_manager.hpp"
 #include "blockchain/block_header_repository.hpp"
 #include "blockchain/block_tree.hpp"
@@ -34,7 +35,6 @@
 #include "primitives/common.hpp"
 #include "runtime/runtime_api/grandpa_api.hpp"
 #include "runtime/runtime_api/parachain_host.hpp"
-#include "scale/scale.hpp"
 #include "utils/pool_handler.hpp"
 
 namespace kagome::consensus::grandpa {

core/consensus/grandpa/voting_round_error.cpp

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "voting_round_error.hpp"
+#include "consensus/grandpa/voting_round_error.hpp"
 
 OUTCOME_CPP_DEFINE_CATEGORY(kagome::consensus::grandpa, VotingRoundError, e) {
   using E = kagome::consensus::grandpa::VotingRoundError;

core/crypto/blake2/blake2b.cpp

@@ -10,7 +10,7 @@
 // blake2b.c
 // A simple BLAKE2b Reference Implementation.
 
-#include "blake2b.h"
+#include "crypto/blake2/blake2b.h"
 
 namespace kagome::crypto {
 

core/crypto/blake2/blake2s.cpp

@@ -10,7 +10,7 @@
 // blake2s.c
 // A simple blake2s Reference Implementation.
 
-#include "blake2s.h"
+#include "crypto/blake2/blake2s.h"
 
 #include <cstdint>
 

core/crypto/ed25519_types.cpp

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "ed25519_types.hpp"
+#include "crypto/ed25519_types.hpp"
 
 namespace kagome::crypto {
   bool Ed25519Keypair::operator==(const Ed25519Keypair &other) const {

core/crypto/key_store/key_type.hpp

@@ -6,9 +6,9 @@
 
 #pragma once
 
+#include <scale/scale.hpp>
 #include "common/buffer.hpp"
 #include "outcome/outcome.hpp"
-#include "scale/scale.hpp"
 
 namespace kagome::crypto {
 

core/crypto/random_generator.hpp

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "libp2p/crypto/random_generator.hpp"
+#include <libp2p/crypto/random_generator.hpp>
 
 namespace kagome::crypto {
   using RandomGenerator = libp2p::crypto::random::RandomGenerator;

core/crypto/random_generator/boost_generator.hpp

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "libp2p/crypto/random_generator/boost_generator.hpp"
+#include <libp2p/crypto/random_generator/boost_generator.hpp>
 
 namespace kagome::crypto {
 

core/dispute_coordinator/impl/storage_impl.cpp

@@ -6,7 +6,7 @@
 
 #include "dispute_coordinator/impl/storage_impl.hpp"
 
-#include "scale/scale.hpp"
+#include <scale/scale.hpp>
 #include "storage/predefined_keys.hpp"
 #include "storage/spaced_storage.hpp"
 

core/dispute_coordinator/provisioner/impl/prioritized_selection.hpp

@@ -6,9 +6,9 @@
 
 #pragma once
 
+#include <scale/bitvec.hpp>
 #include "dispute_coordinator/types.hpp"
 #include "log/logger.hpp"
-#include "scale/bitvec.hpp"
 
 namespace kagome::runtime {
   class ParachainHost;

core/host_api/impl/child_storage_extension.cpp

@@ -11,14 +11,14 @@
 
 #include <fmt/std.h>
 
+#include <scale/encode_append.hpp>
 #include "common/monadic_utils.hpp"
 #include "common/tagged.hpp"
 #include "host_api/impl/storage_util.hpp"
 #include "log/trace_macros.hpp"
 #include "runtime/memory_provider.hpp"
 #include "runtime/ptr_size.hpp"
 #include "runtime/trie_storage_provider.hpp"
-#include "scale/encode_append.hpp"
 #include "storage/predefined_keys.hpp"
 #include "storage/trie/polkadot_trie/trie_error.hpp"
 

core/host_api/impl/crypto_extension.cpp

@@ -13,6 +13,7 @@
 #include <boost/assert.hpp>
 #include <span>
 
+#include <scale/scale.hpp>
 #include "crypto/bandersnatch_provider.hpp"
 #include "crypto/ecdsa_provider.hpp"
 #include "crypto/ed25519_provider.hpp"
@@ -23,7 +24,6 @@
 #include "crypto/sr25519_provider.hpp"
 #include "log/trace_macros.hpp"
 #include "runtime/ptr_size.hpp"
-#include "scale/scale.hpp"
 
 namespace {
   template <typename Format, typename... Args>

core/host_api/impl/misc_extension.cpp

@@ -6,12 +6,12 @@
 
 #include "host_api/impl/misc_extension.hpp"
 
+#include <scale/scale.hpp>
 #include "log/trace_macros.hpp"
 #include "primitives/version.hpp"
 #include "runtime/core_api_factory.hpp"
 #include "runtime/memory_provider.hpp"
 #include "runtime/runtime_api/core.hpp"
-#include "scale/scale.hpp"
 
 namespace kagome::host_api {
 

core/host_api/impl/offchain_extension.cpp

@@ -9,13 +9,13 @@
 #include <stdexcept>
 #include <thread>
 
+#include <scale/scale.hpp>
 #include "log/trace_macros.hpp"
 #include "offchain/offchain_worker.hpp"
 #include "offchain/offchain_worker_pool.hpp"
 #include "runtime/memory.hpp"
 #include "runtime/memory_provider.hpp"
 #include "runtime/ptr_size.hpp"
-#include "scale/scale.hpp"
 
 namespace kagome::host_api {
 

core/host_api/impl/storage_extension.cpp

@@ -11,6 +11,7 @@
 
 #include <fmt/std.h>
 
+#include <scale/encode_append.hpp>
 #include "clock/impl/clock_impl.hpp"
 #include "common/monadic_utils.hpp"
 #include "common/outcome_throw.hpp"
@@ -23,7 +24,6 @@
 #include "runtime/memory_provider.hpp"
 #include "runtime/ptr_size.hpp"
 #include "runtime/trie_storage_provider.hpp"
-#include "scale/encode_append.hpp"
 #include "storage/predefined_keys.hpp"
 #include "storage/trie/impl/topper_trie_batch_impl.hpp"
 #include "storage/trie/serialization/ordered_trie_hash.hpp"