6

Signed-off-by: iceseer <[email protected]>
qdrvm · Nov 22, 2024 · d47f448 · d47f448
1 parent 97087fb
commit d47f448
Show file tree

Hide file tree

Showing 18 changed files with 20 additions and 15 deletions.
diff --git a/core/authority_discovery/publisher/address_publisher.cpp b/core/authority_discovery/publisher/address_publisher.cpp
@@ -10,6 +10,7 @@
 
 #include "authority_discovery/timestamp.hpp"
 #include "crypto/sha/sha256.hpp"
+#include "scale/kagome_scale.hpp"
 
 #define _PB_SPAN(f) \
   [&](::kagome::common::BufferView a) { (f)(a.data(), a.size()); }

diff --git a/core/common/empty.hpp b/core/common/empty.hpp
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <scale/scale.hpp>
+#include "scale/encoder/external_scale.hpp"
 
 namespace kagome {
 

diff --git a/core/common/tagged.hpp b/core/common/tagged.hpp
@@ -9,7 +9,7 @@
 #include <type_traits>
 #include <utility>
 
-#include <scale/scale.hpp>
+#include "scale/encoder/external_scale.hpp"
 
 namespace kagome {
 

diff --git a/core/consensus/babe/types/babe_block_header.hpp b/core/consensus/babe/types/babe_block_header.hpp
@@ -11,7 +11,7 @@
 #include "consensus/timeline/types.hpp"
 #include "primitives/common.hpp"
 
-#include <scale/scale.hpp>
+#include "scale/encoder/external_scale.hpp"
 
 namespace kagome::consensus::babe {
   /**

diff --git a/core/network/notifications/encode.hpp b/core/network/notifications/encode.hpp
@@ -8,7 +8,7 @@
 
 #include <memory>
 
-#include <scale/scale.hpp>
+#include "scale/encoder/external_scale.hpp"
 
 #include "common/buffer.hpp"
 

diff --git a/core/network/notifications/handshake.hpp b/core/network/notifications/handshake.hpp
@@ -10,7 +10,7 @@
 
 #include <libp2p/basic/message_read_writer_uvarint.hpp>
 #include <libp2p/connection/stream.hpp>
-#include <scale/scale.hpp>
+#include "scale/encoder/external_scale.hpp"
 
 namespace kagome::network::notifications {
   using libp2p::basic::MessageReadWriterUvarint;

diff --git a/core/network/notifications/read_messages.hpp b/core/network/notifications/read_messages.hpp
@@ -8,7 +8,7 @@
 
 #include <libp2p/basic/message_read_writer_uvarint.hpp>
 #include <libp2p/connection/stream.hpp>
-#include <scale/scale.hpp>
+#include "scale/encoder/external_scale.hpp"
 
 namespace kagome::network::notifications {
   using libp2p::basic::MessageReadWriterUvarint;

diff --git a/core/parachain/pvf/secure_mode_precheck.cpp b/core/parachain/pvf/secure_mode_precheck.cpp
@@ -16,7 +16,7 @@
 #include <iostream>
 #include <libp2p/log/configurator.hpp>
 #include <qtils/bytestr.hpp>
-#include <scale/scale.hpp>
+#include "scale/kagome_scale.hpp"
 #include <soralog/macro.hpp>
 
 #include "common/buffer.hpp"

diff --git a/core/primitives/block_header.hpp b/core/primitives/block_header.hpp
@@ -9,7 +9,7 @@
 #include <type_traits>
 #include <vector>
 
-#include <scale/scale.hpp>
+#include "scale/encoder/external_scale.hpp"
 
 #include "common/blob.hpp"
 #include "crypto/hasher.hpp"

diff --git a/core/primitives/runtime_dispatch_info.hpp b/core/primitives/runtime_dispatch_info.hpp
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <scale/scale.hpp>
+#include "scale/encoder/external_scale.hpp"
 #include <scale/tie.hpp>
 
 #include "common/unused.hpp"

diff --git a/core/scale/encoder/external_scale.hpp b/core/scale/encoder/external_scale.hpp
@@ -10,6 +10,7 @@
 #include "scale/encode_append.hpp"
 #include "scale/encoder/concepts.hpp"
 #include "scale/libp2p_types.hpp"
+#include <scale/types.hpp>
 #include "common/size_limited_containers.hpp"
 //#include "common/tagged.hpp"
 //#include "common/buffer.hpp"
@@ -77,6 +78,8 @@ namespace kagome::scale {
   template <typename T>
   using Compact = ::scale::Compact<T>;
   using uint128_t = ::scale::uint128_t;
+  using Timestamp = scale::uint128_t;
+  using TimestampScale = scale::Fixed<Timestamp>;
 
   using ::scale::decode;
   using ::scale::append_or_new_vec;

diff --git a/core/utils/lru_encoded.hpp b/core/utils/lru_encoded.hpp
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <scale/scale.hpp>
+#include "scale/encoder/external_scale.hpp"
 
 #include <boost/container_hash/hash.hpp>
 

diff --git a/node/main.cpp b/node/main.cpp
@@ -24,6 +24,7 @@
 #include "log/configurator.hpp"
 #include "log/logger.hpp"
 #include "parachain/pvf/kagome_pvf_worker.hpp"
+#include "scale/kagome_scale.hpp"
 
 // NOLINTBEGIN(cppcoreguidelines-pro-bounds-pointer-arithmetic)
 

diff --git a/test/core/host_api/child_storage_extension_test.cpp b/test/core/host_api/child_storage_extension_test.cpp
@@ -8,7 +8,7 @@
 
 #include <gtest/gtest.h>
 #include <optional>
-#include <scale/scale.hpp>
+#include "scale/kagome_scale.hpp"
 
 #include "common/monadic_utils.hpp"
 #include "mock/core/runtime/memory_provider_mock.hpp"

diff --git a/test/core/host_api/storage_extension_test.cpp b/test/core/host_api/storage_extension_test.cpp
@@ -10,7 +10,7 @@
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
-#include <scale/scale.hpp>
+#include "scale/kagome_scale.hpp"
 
 #include "crypto/hasher/hasher_impl.hpp"
 #include "mock/core/runtime/memory_provider_mock.hpp"

diff --git a/test/core/network/types/block_direction_test.cpp b/test/core/network/types/block_direction_test.cpp
@@ -7,7 +7,7 @@
 #include "network/types/block_direction.hpp"
 
 #include <gtest/gtest.h>
-#include <scale/scale.hpp>
+#include "scale/kagome_scale.hpp"
 
 #include "testutil/outcome.hpp"
 #include "testutil/testparam.hpp"

diff --git a/test/core/scale/big_fixed_integers_test.cpp b/test/core/scale/big_fixed_integers_test.cpp
@@ -7,7 +7,7 @@
 #include "scale/big_fixed_integers.hpp"
 
 #include <gtest/gtest.h>
-#include <scale/scale.hpp>
+#include "scale/encoder/external_scale.hpp"
 
 #include "testutil/literals.hpp"
 #include "testutil/outcome.hpp"

diff --git a/test/testutil/runtime/memory.hpp b/test/testutil/runtime/memory.hpp
@@ -7,7 +7,7 @@
 #pragma once
 
 #include <memory>
-#include <scale/scale.hpp>
+#include "scale/encoder/external_scale.hpp"
 
 #include "common/buffer.hpp"
 #include "common/span_adl.hpp"