Bump to latest scale-encode/decode/value and fix test running (#1103)

* Bump to latest scale-encode,decode,value and fix test running

* remove patch deps

* update CI to spit out 'substrate-node' binary now

* fmt

* Fix test: compact type ID no longer present so can't re-encode Value in same way

* remove patch

* Fix cargo.lock

* Fix other compact test

subxt/src/events/events_type.rs

@@ -602,25 +602,9 @@ mod tests {
     /// Compare some actual [`RawEventDetails`] with a hand-constructed
     /// (probably) [`TestRawEventDetails`].
     pub fn assert_raw_events_match(
-        // Just for convenience, pass in the metadata type constructed
-        // by the `metadata` function above to simplify caller code.
-        metadata: &Metadata,
         actual: EventDetails<SubstrateConfig>,
         expected: TestRawEventDetails,
     ) {
-        let types = &metadata.types();
-
-        // Make sure that the bytes handed back line up with the fields handed back;
-        // encode the fields back into bytes and they should be equal.
-        let actual_fields = actual.field_values().expect("can decode field values (1)");
-
-        let mut actual_bytes = vec![];
-        for field in actual_fields.into_values() {
-            scale_value::scale::encode_as_type(&field, field.context, types, &mut actual_bytes)
-                .expect("should be able to encode properly");
-        }
-        assert_eq!(actual_bytes, actual.field_bytes());
-
         let actual_fields_no_context: Vec<_> = actual
             .field_values()
             .expect("can decode field values (2)")
@@ -691,7 +675,6 @@ mod tests {
 
         let mut event_details = events.iter();
         assert_raw_events_match(
-            &metadata,
             event_details.next().unwrap().unwrap(),
             TestRawEventDetails {
                 phase: Phase::ApplyExtrinsic(123),
@@ -739,7 +722,6 @@ mod tests {
         let mut event_details = events.iter();
 
         assert_raw_events_match(
-            &metadata,
             event_details.next().unwrap().unwrap(),
             TestRawEventDetails {
                 index: 0,
@@ -752,7 +734,6 @@ mod tests {
             },
         );
         assert_raw_events_match(
-            &metadata,
             event_details.next().unwrap().unwrap(),
             TestRawEventDetails {
                 index: 1,
@@ -765,7 +746,6 @@ mod tests {
             },
         );
         assert_raw_events_match(
-            &metadata,
             event_details.next().unwrap().unwrap(),
             TestRawEventDetails {
                 index: 2,
@@ -809,7 +789,6 @@ mod tests {
 
         let mut events_iter = events.iter();
         assert_raw_events_match(
-            &metadata,
             events_iter.next().unwrap().unwrap(),
             TestRawEventDetails {
                 index: 0,
@@ -822,7 +801,6 @@ mod tests {
             },
         );
         assert_raw_events_match(
-            &metadata,
             events_iter.next().unwrap().unwrap(),
             TestRawEventDetails {
                 index: 1,
@@ -862,7 +840,6 @@ mod tests {
         // Dynamically decode:
         let mut event_details = events.iter();
         assert_raw_events_match(
-            &metadata,
             event_details.next().unwrap().unwrap(),
             TestRawEventDetails {
                 index: 0,
@@ -903,7 +880,6 @@ mod tests {
         // Dynamically decode:
         let mut event_details = events.iter();
         assert_raw_events_match(
-            &metadata,
             event_details.next().unwrap().unwrap(),
             TestRawEventDetails {
                 index: 0,
@@ -912,7 +888,7 @@ mod tests {
                 pallet_index: 0,
                 variant: "A".to_string(),
                 variant_index: 0,
-                fields: vec![Value::u128(1)],
+                fields: vec![Value::unnamed_composite(vec![Value::u128(1)])],
             },
         );
         assert!(event_details.next().is_none());
@@ -945,7 +921,6 @@ mod tests {
         // Dynamically decode:
         let mut event_details = events.iter();
         assert_raw_events_match(
-            &metadata,
             event_details.next().unwrap().unwrap(),
             TestRawEventDetails {
                 index: 0,

subxt/src/tx/tx_client.rs

@@ -193,7 +193,7 @@ where
             2 => u16::decode(cursor)?.into(),
             4 => u32::decode(cursor)?.into(),
             8 => u64::decode(cursor)?,
-            _ => return Err(Error::Decode(DecodeError::custom(format!("state call AccountNonceApi_account_nonce returned an unexpected number of bytes: {} (expected 2, 4 or 8)", account_nonce_bytes.len()))))
+            _ => return Err(Error::Decode(DecodeError::custom_string(format!("state call AccountNonceApi_account_nonce returned an unexpected number of bytes: {} (expected 2, 4 or 8)", account_nonce_bytes.len()))))
         };
         Ok(account_nonce)
     }

subxt/src/utils/wrapper_opaque.rs

@@ -121,9 +121,9 @@ impl<T> Visitor for WrapperKeepOpaqueVisitor<T> {
         use scale_decode::error::{Error, ErrorKind};
 
         if value.path().ident().as_deref() != Some("WrapperKeepOpaque") {
-            return Err(Error::new(ErrorKind::Custom(
-                "Type to decode is not 'WrapperTypeKeepOpaque'".into(),
-            )));
+            return Err(Error::custom_str(
+                "Type to decode is not 'WrapperTypeKeepOpaque'",
+            ));
         }
         if value.remaining() != 2 {
             return Err(Error::new(ErrorKind::WrongLength {
@@ -140,7 +140,7 @@ impl<T> Visitor for WrapperKeepOpaqueVisitor<T> {
 
         // Sanity check that the compact length we decoded lines up with the number of bytes encoded in the next field.
         if field.bytes().len() != len as usize {
-            return Err(Error::new(ErrorKind::Custom("WrapperTypeKeepOpaque compact encoded length doesn't line up with encoded byte len".into())));
+            return Err(Error::custom_str("WrapperTypeKeepOpaque compact encoded length doesn't line up with encoded byte len"));
         }
 
         Ok(WrapperKeepOpaque {