Decode raw events using scale_value and return the decoded Values, too (

#576)

* Decode raw events using scale_value and return the decoded Values, too

* cargo fmt

* cargo fmt and slight rearranging of test code

subxt/Cargo.toml

@@ -22,6 +22,7 @@ integration-tests = []
 bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] }
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "full", "bit-vec"] }
 scale-info = { version = "2.0.0", features = ["bit-vec"] }
+scale-value = "0.2.0"
 futures = "0.3.13"
 hex = "0.4.3"
 jsonrpsee = { version = "0.14.0", features = ["async-client", "client-ws-transport"] }
@@ -41,5 +42,4 @@ frame-metadata = "15.0.0"
 derivative = "2.2.0"
 
 [dev-dependencies]
-assert_matches = "1.5.0"
 tokio = { version = "1.8", features = ["macros", "time"] }

subxt/src/error.rs

@@ -14,15 +14,13 @@
 // You should have received a copy of the GNU General Public License
 // along with subxt.  If not, see <http://www.gnu.org/licenses/>.
 
-use crate::{
-    events::EventsDecodingError,
-    metadata::{
-        InvalidMetadataError,
-        MetadataError,
-    },
+use crate::metadata::{
+    InvalidMetadataError,
+    MetadataError,
 };
 use core::fmt::Debug;
 use jsonrpsee::core::error::Error as RequestError;
+use scale_value::scale::DecodeError;
 use sp_core::crypto::SecretStringError;
 use sp_runtime::transaction_validity::TransactionValidityError;
 
@@ -66,7 +64,7 @@ pub enum GenericError<E> {
     Runtime(E),
     /// Events decoding error.
     #[error("Events decoding error: {0}")]
-    EventsDecoding(#[from] EventsDecodingError),
+    EventsDecoding(#[from] DecodeError),
     /// Transaction progress error.
     #[error("Transaction error: {0}")]
     Transaction(#[from] TransactionError),