From 859b3d92643c9aba43e5a40634049d3a5d38dfd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <mich@elmueller.net>
Date: Tue, 28 Jan 2025 10:48:09 +0100
Subject: [PATCH] Minor fixes for some CI failures (#2383)

---
 .config/cargo_spellcheck.dic                    | 3 +++
 .github/rust-info/action.yml                    | 2 +-
 crates/env/src/engine/on_chain/pallet_revive.rs | 6 ++----
 crates/ink/ir/src/ir/config.rs                  | 2 +-
 crates/primitives/src/reflect/dispatch.rs       | 4 ++--
 integration-tests/public/trait-flipper/lib.rs   | 6 ------
 6 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/.config/cargo_spellcheck.dic b/.config/cargo_spellcheck.dic
index bae78ab220..c4cc6aa283 100644
--- a/.config/cargo_spellcheck.dic
+++ b/.config/cargo_spellcheck.dic
@@ -12,12 +12,14 @@ FFI
 Gnosis
 GPL
 KECCAK
+Keccak
 L1
 L2
 Polkadot
 PolkaVM
 PSP22
 RPC
+RLP
 SHA
 UI/S
 URI
@@ -29,6 +31,7 @@ bitvector
 bitmask
 bitwise
 callee
+codec
 codegen
 comparator
 const
diff --git a/.github/rust-info/action.yml b/.github/rust-info/action.yml
index b66a1f4e02..f9fb7c293c 100644
--- a/.github/rust-info/action.yml
+++ b/.github/rust-info/action.yml
@@ -11,5 +11,5 @@ runs:
         cargo spellcheck --version
         bash --version
         substrate-contracts-node --version
-        cargo-contract --version
+        cargo contract --version
       shell: bash
diff --git a/crates/env/src/engine/on_chain/pallet_revive.rs b/crates/env/src/engine/on_chain/pallet_revive.rs
index dfb09d25ba..042afbd6f6 100644
--- a/crates/env/src/engine/on_chain/pallet_revive.rs
+++ b/crates/env/src/engine/on_chain/pallet_revive.rs
@@ -22,10 +22,6 @@ use crate::{
         FromAddr,
         LimitParamsV2,
     },
-    dispatch::{
-        DecodeDispatch,
-        DispatchError,
-    },
     engine::on_chain::{
         EncodeScope,
         EnvInstance,
@@ -45,6 +41,8 @@ use crate::{
     },
     types::FromLittleEndian,
     Clear,
+    DecodeDispatch,
+    DispatchError,
     EnvBackend,
     Environment,
     Result,
diff --git a/crates/ink/ir/src/ir/config.rs b/crates/ink/ir/src/ir/config.rs
index ce159a773d..b847571e83 100644
--- a/crates/ink/ir/src/ir/config.rs
+++ b/crates/ink/ir/src/ir/config.rs
@@ -156,7 +156,7 @@ impl Default for Environment {
 #[derive(Debug, Clone, PartialEq, Eq, Default)]
 
 pub enum AbiEncoding {
-    /// Scale codec, the default.
+    /// SCALE codec, the default.
     #[default]
     Scale,
     /// RLP codec, useful for compatibility with Solidity contracts.
diff --git a/crates/primitives/src/reflect/dispatch.rs b/crates/primitives/src/reflect/dispatch.rs
index abb736fed5..913087ddf7 100644
--- a/crates/primitives/src/reflect/dispatch.rs
+++ b/crates/primitives/src/reflect/dispatch.rs
@@ -232,7 +232,7 @@ pub enum Encoding {
 }
 
 /// Custom unit type for RLP encodable messages which return `()`.
-/// This is because ['alloy_rlp::Encodable`] is not implemented for the build-in `()` type
+/// This is because [`alloy_rlp::Encodable`] is not implemented for the build-in `()` type
 #[derive(alloy_rlp::RlpEncodable)]
 pub struct RlpUnit {}
 
@@ -567,7 +567,7 @@ impl From<DispatchError> for scale::Error {
 ///
 /// # Usage
 ///
-/// todo: prev doc test used a contract instance, it was in the `ink!` crate.
+/// todo: previous doc test used a contract instance, it was in the `ink!` crate.
 pub trait DecodeDispatch: Sized {
     /// todo: docs
     fn decode_dispatch(input: &mut &[u8]) -> Result<Self, DispatchError>;
diff --git a/integration-tests/public/trait-flipper/lib.rs b/integration-tests/public/trait-flipper/lib.rs
index fae9721ac0..9077c4e21b 100644
--- a/integration-tests/public/trait-flipper/lib.rs
+++ b/integration-tests/public/trait-flipper/lib.rs
@@ -37,12 +37,6 @@ pub mod flipper {
 
         #[ink(message)]
         fn get(&self) -> bool {
-            /*
-            let registry = ::ink::reflect::TraitDefinitionRegistry::<Environment>{
-                marker: Default::default()
-            };
-            registry.get();
-            */
             self.value
         }
     }