use visitor of decoder

node-api/src/error.rs

@@ -28,8 +28,8 @@ use scale_info::TypeDef;
 
 // Re-expose the errors we use from other crates here:
 pub use crate::{
-	decoder::{DecodeError, EncodeError},
 	metadata::{InvalidMetadataError, MetadataError},
+	scale_value::DecodeError,
 };
 pub use sp_core::crypto::SecretStringError;
 pub use sp_runtime::transaction_validity::TransactionValidityError;
@@ -55,8 +55,6 @@ pub enum Error {
 	Runtime(DispatchError),
 	/// Error decoding to a [`crate::dynamic::Value`].
 	DecodeValue(DecodeError),
-	/// Error encoding from a [`crate::dynamic::Value`].
-	EncodeValue(EncodeError<()>),
 	/// Transaction progress error.
 	Transaction(TransactionError),
 	/// Block related error.

node-api/src/events.rs

@@ -13,9 +13,9 @@
 
 use crate::{
 	alloc::{string::ToString, sync::Arc, vec, vec::Vec},
-	decoder::{decode_as_type, Composite, TypeId},
 	error::{DispatchError, Error},
 	metadata::EventMetadata,
+	scale_value::{decode_as_type, Composite, TypeId},
 	Metadata, Phase, StaticEvent,
 };
 use codec::{Compact, Decode, Error as CodecError};
@@ -329,7 +329,7 @@ impl EventDetails {
 mod tests {
 	use super::*;
 	use crate::{
-		decoder::Value,
+		scale_value::Value,
 		test_utils::{event_record, events, events_raw, metadata},
 	};
 	use codec::Encode;
@@ -365,7 +365,7 @@ mod tests {
 		let actual_fields = actual.field_values().expect("can decode field values (1)");
 		let mut actual_bytes = vec![];
 		for field in actual_fields.into_values() {
-			crate::decoder::encode_as_type(field.clone(), field.context, types, &mut actual_bytes)
+			crate::scale_value::encode_as_type(&field, field.context, types, &mut actual_bytes)
 				.expect("should be able to encode properly");
 		}
 		assert_eq!(actual_bytes, actual.field_bytes());
@@ -417,7 +417,7 @@ mod tests {
 				variant: "A".to_string(),
 				variant_index: 0,
 				fields: vec![
-					Value::uint(1u8),
+					Value::u128(1u128),
 					Value::bool(true),
 					Value::unnamed_composite(vec![Value::string("Hi")]),
 				],
@@ -464,7 +464,7 @@ mod tests {
 				pallet_index: 0,
 				variant: "A".to_string(),
 				variant_index: 0,
-				fields: vec![Value::uint(1u8)],
+				fields: vec![Value::u128(1u128)],
 			},
 		);
 		assert_raw_events_match(
@@ -490,7 +490,7 @@ mod tests {
 				pallet_index: 0,
 				variant: "A".to_string(),
 				variant_index: 0,
-				fields: vec![Value::uint(234u16)],
+				fields: vec![Value::u128(234u128)],
 			},
 		);
 		assert!(event_details.next().is_none());
@@ -534,7 +534,7 @@ mod tests {
 				pallet_index: 0,
 				variant: "A".to_string(),
 				variant_index: 0,
-				fields: vec![Value::uint(1u8)],
+				fields: vec![Value::u128(1u128)],
 			},
 		);
 		assert_raw_events_match(
@@ -585,7 +585,7 @@ mod tests {
 				pallet_index: 0,
 				variant: "A".to_string(),
 				variant_index: 0,
-				fields: vec![Value::uint(1u8)],
+				fields: vec![Value::u128(1u128)],
 			},
 		);
 		assert!(event_details.next().is_none());
@@ -623,7 +623,7 @@ mod tests {
 				pallet_index: 0,
 				variant: "A".to_string(),
 				variant_index: 0,
-				fields: vec![Value::unnamed_composite(vec![Value::uint(1u8)])],
+				fields: vec![Value::unnamed_composite(vec![Value::u128(1u128)])],
 			},
 		);
 		assert!(event_details.next().is_none());

node-api/src/lib.rs

@@ -21,15 +21,15 @@ extern crate alloc;
 use alloc::{borrow::ToOwned, vec::Vec};
 use codec::{Decode, Encode};
 
-pub use decoder::{DecodeError, EncodeError};
 pub use events::{EventDetails, Events};
 pub use metadata::{Metadata, MetadataError};
+pub use scale_decode::DecodeError;
 
-pub mod decoder;
 pub mod error;
 pub mod events;
 pub mod metadata;
 pub mod scale_decode;
+pub mod scale_value;
 pub mod storage;
 
 #[cfg(any(feature = "mocks", test))]