Rename traits to remove T suffix (#1535)

* Rename traits to renmove T suffix

* Fix doc links

* Fix straggler doc links

core/src/runtime_api/mod.rs

@@ -49,13 +49,13 @@ use alloc::borrow::ToOwned;
 use alloc::format;
 use alloc::string::String;
 use alloc::vec::Vec;
-use payload::PayloadT;
+use payload::Payload;
 
 /// Run the validation logic against some runtime API payload you'd like to use. Returns `Ok(())`
 /// if the payload is valid (or if it's not possible to check since the payload has no validation hash).
 /// Return an error if the payload was not valid or something went wrong trying to validate it (ie
 /// the runtime API in question do not exist at all)
-pub fn validate<Payload: PayloadT>(payload: &Payload, metadata: &Metadata) -> Result<(), Error> {
+pub fn validate<P: Payload>(payload: &P, metadata: &Metadata) -> Result<(), Error> {
     let Some(static_hash) = payload.validation_hash() else {
         return Ok(());
     };
@@ -72,30 +72,27 @@ pub fn validate<Payload: PayloadT>(payload: &Payload, metadata: &Metadata) -> Re
 }
 
 /// Return the name of the runtime API call from the payload.
-pub fn call_name<Payload: PayloadT>(payload: &Payload) -> String {
+pub fn call_name<P: Payload>(payload: &P) -> String {
     format!("{}_{}", payload.trait_name(), payload.method_name())
 }
 
 /// Return the encoded call args given a runtime API payload.
-pub fn call_args<Payload: PayloadT>(
-    payload: &Payload,
-    metadata: &Metadata,
-) -> Result<Vec<u8>, Error> {
+pub fn call_args<P: Payload>(payload: &P, metadata: &Metadata) -> Result<Vec<u8>, Error> {
     payload.encode_args(metadata)
 }
 
 /// Decode the value bytes at the location given by the provided runtime API payload.
-pub fn decode_value<Payload: PayloadT>(
+pub fn decode_value<P: Payload>(
     bytes: &mut &[u8],
-    payload: &Payload,
+    payload: &P,
     metadata: &Metadata,
-) -> Result<Payload::ReturnType, Error> {
+) -> Result<P::ReturnType, Error> {
     let api_method = metadata
         .runtime_api_trait_by_name_err(payload.trait_name())?
         .method_by_name(payload.method_name())
         .ok_or_else(|| MetadataError::RuntimeMethodNotFound(payload.method_name().to_owned()))?;
 
-    let val = <Payload::ReturnType as DecodeWithMetadata>::decode_with_metadata(
+    let val = <P::ReturnType as DecodeWithMetadata>::decode_with_metadata(
         &mut &bytes[..],
         api_method.output_ty(),
         metadata,

core/src/runtime_api/payload.rs

@@ -40,7 +40,7 @@ use crate::metadata::{DecodeWithMetadata, Metadata};
 /// - encoded arguments
 ///
 /// Each argument of the runtime function must be scale-encoded.
-pub trait PayloadT {
+pub trait Payload {
     /// The return type of the function call.
     // Note: `DecodeWithMetadata` is needed to decode the function call result
     // with the `subxt::Metadata.
@@ -56,7 +56,7 @@ pub trait PayloadT {
     fn encode_args_to(&self, metadata: &Metadata, out: &mut Vec<u8>) -> Result<(), Error>;
 
     /// Encode arguments data and return the output. This is a convenience
-    /// wrapper around [`PayloadT::encode_args_to`].
+    /// wrapper around [`Payload::encode_args_to`].
     fn encode_args(&self, metadata: &Metadata) -> Result<Vec<u8>, Error> {
         let mut v = Vec::new();
         self.encode_args_to(metadata, &mut v)?;
@@ -75,7 +75,7 @@ pub trait PayloadT {
 /// This can be created from static values (ie those generated
 /// via the `subxt` macro) or dynamic values via [`dynamic`].
 #[derive_where(Clone, Debug, Eq, Ord, PartialEq, PartialOrd; ArgsData)]
-pub struct Payload<ArgsData, ReturnTy> {
+pub struct DefaultPayload<ArgsData, ReturnTy> {
     trait_name: Cow<'static, str>,
     method_name: Cow<'static, str>,
     args_data: ArgsData,
@@ -83,8 +83,13 @@ pub struct Payload<ArgsData, ReturnTy> {
     _marker: PhantomData<ReturnTy>,
 }
 
-impl<ArgsData: EncodeAsFields, ReturnTy: DecodeWithMetadata> PayloadT
-    for Payload<ArgsData, ReturnTy>
+/// A statically generated runtime API payload.
+pub type StaticPayload<ArgsData, ReturnTy> = DefaultPayload<ArgsData, ReturnTy>;
+/// A dynamic runtime API payload.
+pub type DynamicPayload = DefaultPayload<Composite<()>, DecodedValueThunk>;
+
+impl<ArgsData: EncodeAsFields, ReturnTy: DecodeWithMetadata> Payload
+    for DefaultPayload<ArgsData, ReturnTy>
 {
     type ReturnType = ReturnTy;
 
@@ -115,17 +120,14 @@ impl<ArgsData: EncodeAsFields, ReturnTy: DecodeWithMetadata> PayloadT
     }
 }
 
-/// A dynamic runtime API payload.
-pub type DynamicPayload = Payload<Composite<()>, DecodedValueThunk>;
-
-impl<ReturnTy, ArgsData> Payload<ArgsData, ReturnTy> {
-    /// Create a new [`Payload`].
+impl<ReturnTy, ArgsData> DefaultPayload<ArgsData, ReturnTy> {
+    /// Create a new [`DefaultPayload`].
     pub fn new(
         trait_name: impl Into<String>,
         method_name: impl Into<String>,
         args_data: ArgsData,
     ) -> Self {
-        Payload {
+        DefaultPayload {
             trait_name: Cow::Owned(trait_name.into()),
             method_name: Cow::Owned(method_name.into()),
             args_data,
@@ -134,7 +136,7 @@ impl<ReturnTy, ArgsData> Payload<ArgsData, ReturnTy> {
         }
     }
 
-    /// Create a new static [`Payload`] using static function name
+    /// Create a new static [`DefaultPayload`] using static function name
     /// and scale-encoded argument data.
     ///
     /// This is only expected to be used from codegen.
@@ -144,8 +146,8 @@ impl<ReturnTy, ArgsData> Payload<ArgsData, ReturnTy> {
         method_name: &'static str,
         args_data: ArgsData,
         hash: [u8; 32],
-    ) -> Payload<ArgsData, ReturnTy> {
-        Payload {
+    ) -> DefaultPayload<ArgsData, ReturnTy> {
+        DefaultPayload {
             trait_name: Cow::Borrowed(trait_name),
             method_name: Cow::Borrowed(method_name),
             args_data,
@@ -184,5 +186,5 @@ pub fn dynamic(
     method_name: impl Into<String>,
     args_data: impl Into<Composite<()>>,
 ) -> DynamicPayload {
-    Payload::new(trait_name, method_name, args_data.into())
+    DefaultPayload::new(trait_name, method_name, args_data.into())
 }