address review feedback

Cargo.toml

@@ -259,7 +259,6 @@ xcm-runtime-apis = { git = "https://github.com/moondance-labs/polkadot-sdk", bra
 
 
 # Bridges (wasm)
-alloy-primitives = { version = "0.4.2", default-features = false }
 alloy-sol-types = { version = "0.4.2", default-features = false }
 milagro-bls = { package = "snowbridge-milagro-bls", version = "1.5.4", default-features = false }
 snowbridge-beacon-primitives = { git = "https://github.com/moondance-labs/polkadot-sdk", branch = "tanssi-polkadot-stable2409", default-features = false }

primitives/bridge/src/symbiotic_message_processor.rs

@@ -43,11 +43,11 @@ pub enum Message<T>
 where
     T: pallet_external_validators::Config,
 {
-    V1(Command<T>),
+    V1(InboundCommand<T>),
 }
 
 #[derive(Encode, Decode)]
-pub enum Command<T>
+pub enum InboundCommand<T>
 where
     T: pallet_external_validators::Config,
 {
@@ -76,11 +76,11 @@ where
         let message = if let Ok(payload) = decode_result {
             payload.message
         } else {
-            return Err(DispatchError::Other("unable to parse the payload"));
+            return Err(DispatchError::Other("unable to parse the envelope payload"));
         };
 
         match message {
-            Message::V1(Command::ReceiveValidators { validators }) => {
+            Message::V1(InboundCommand::ReceiveValidators { validators }) => {
                 pallet_external_validators::Pallet::<T>::set_external_validators(validators)?;
                 Ok(())
             }

solo-chains/runtime/dancelight/Cargo.toml

@@ -271,6 +271,7 @@ std = [
 	"snowbridge-core/std",
 	"snowbridge-pallet-ethereum-client/fuzzing",
 	"snowbridge-pallet-ethereum-client/std",
+	"snowbridge-pallet-inbound-queue-fixtures/std",
 	"snowbridge-pallet-inbound-queue/std",
 	"snowbridge-pallet-outbound-queue/std",
 	"snowbridge-pallet-system/std",
@@ -366,8 +367,9 @@ runtime-benchmarks = [
 	"runtime-parachains/runtime-benchmarks",
 	"snowbridge-core/runtime-benchmarks",
 	"snowbridge-pallet-ethereum-client/runtime-benchmarks",
-	"snowbridge-pallet-inbound-queue/runtime-benchmarks",
 	"snowbridge-pallet-inbound-queue-fixtures",
+	"snowbridge-pallet-inbound-queue-fixtures/runtime-benchmarks",
+	"snowbridge-pallet-inbound-queue/runtime-benchmarks",
 	"snowbridge-pallet-outbound-queue/runtime-benchmarks",
 	"snowbridge-pallet-system/runtime-benchmarks",
 	"snowbridge-router-primitives/runtime-benchmarks",

solo-chains/runtime/dancelight/src/tests/inbound_queue_tests/integration_tests.rs

@@ -14,7 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with Tanssi.  If not, see <http://www.gnu.org/licenses/>
 
-use tp_bridge::symbiotic_message_processor::{Message as SymbioticMessage, Command, Payload, MAGIC_BYTES};
 use crate::tests::common::ExtBuilder;
 use crate::{AccountId, EthereumInboundQueue, ExternalValidators, Runtime};
 use alloy_sol_types::SolEvent;
@@ -30,6 +29,9 @@ use snowbridge_core::{
 use snowbridge_router_primitives::inbound::envelope::OutboundMessageAccepted;
 use sp_core::H256;
 use sp_runtime::DispatchError;
+use tp_bridge::symbiotic_message_processor::{
+    InboundCommand, Message as SymbioticMessage, Payload, MAGIC_BYTES,
+};
 
 const MOCK_CHANNEL_ID: [u8; 32] = [0; 32];
 
@@ -94,7 +96,7 @@ fn test_inbound_queue_message_passing() {
 
         let payload = Payload {
             magic_bytes: MAGIC_BYTES,
-            message: SymbioticMessage::V1(Command::<Runtime>::ReceiveValidators {
+            message: SymbioticMessage::V1(InboundCommand::<Runtime>::ReceiveValidators {
                 validators: payload_validators.clone()
             }),
         };

solo-chains/runtime/dancelight/src/tests/inbound_queue_tests/message_processor_tests.rs

@@ -14,9 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with Tanssi.  If not, see <http://www.gnu.org/licenses/>
 
-use tp_bridge::symbiotic_message_processor::{
-    Command, Message, Payload, SymbioticMessageProcessor, MAGIC_BYTES,
-};
 use crate::tests::common::ExtBuilder;
 use crate::{ExternalValidators, Runtime};
 use frame_support::pallet_prelude::*;
@@ -26,6 +23,9 @@ use snowbridge_router_primitives::inbound::envelope::Envelope;
 use snowbridge_router_primitives::inbound::MessageProcessor;
 use sp_core::{H160, H256};
 use sp_runtime::DispatchError;
+use tp_bridge::symbiotic_message_processor::{
+    InboundCommand, Message, Payload, SymbioticMessageProcessor, MAGIC_BYTES,
+};
 
 #[test]
 fn test_symbiotic_message_processor() {
@@ -55,12 +55,14 @@ fn test_symbiotic_message_processor() {
                 default_channel.clone(),
                 envelope_with_invalid_payload
             ),
-            Err(DispatchError::Other("unable to parse the payload"))
+            Err(DispatchError::Other("unable to parse the envelope payload"))
         );
 
         let payload_with_incorrect_magic_bytes = Payload {
             magic_bytes: [1, 2, 3, 4],
-            message: Message::V1(Command::<Runtime>::ReceiveValidators { validators: vec![] }),
+            message: Message::V1(InboundCommand::<Runtime>::ReceiveValidators {
+                validators: vec![],
+            }),
         };
         let envelope = Envelope {
             channel_id: H256::default().into(),
@@ -88,7 +90,7 @@ fn test_symbiotic_message_processor() {
 
         let payload_with_correct_magic_bytes = Payload {
             magic_bytes: MAGIC_BYTES,
-            message: Message::V1(Command::<Runtime>::ReceiveValidators {
+            message: Message::V1(InboundCommand::<Runtime>::ReceiveValidators {
                 validators: payload_validators.clone(),
             }),
         };