From 1816416a5679a8929167451873371c5120e3a91b Mon Sep 17 00:00:00 2001
From: Alexandru Vasile <alexandru.vasile@parity.io>
Date: Fri, 19 Apr 2024 11:43:31 +0300
Subject: [PATCH 1/2] Stabilize transactionWatch

Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io>
---
 subxt/src/backend/unstable/mod.rs                           | 2 +-
 subxt/src/backend/unstable/rpc_methods.rs                   | 6 +++---
 .../src/full_client/client/unstable_rpcs.rs                 | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/subxt/src/backend/unstable/mod.rs b/subxt/src/backend/unstable/mod.rs
index 24af5a88c2..288598da8f 100644
--- a/subxt/src/backend/unstable/mod.rs
+++ b/subxt/src/backend/unstable/mod.rs
@@ -477,7 +477,7 @@ impl<T: Config + Send + Sync + 'static> Backend<T> for UnstableBackend<T> {
         // Then, submit the transaction.
         let mut tx_progress = self
             .methods
-            .transaction_unstable_submit_and_watch(extrinsic)
+            .transaction_watch_v1_submit_and_watch(extrinsic)
             .await?;
 
         let mut seen_blocks = HashMap::new();
diff --git a/subxt/src/backend/unstable/rpc_methods.rs b/subxt/src/backend/unstable/rpc_methods.rs
index e4d4b63bab..8bf63a33e6 100644
--- a/subxt/src/backend/unstable/rpc_methods.rs
+++ b/subxt/src/backend/unstable/rpc_methods.rs
@@ -272,16 +272,16 @@ impl<T: Config> UnstableRpcMethods<T> {
     }
 
     /// Attempt to submit a transaction, returning events about its progress.
-    pub async fn transaction_unstable_submit_and_watch(
+    pub async fn transaction_watch_v1_submit_and_watch(
         &self,
         tx: &[u8],
     ) -> Result<TransactionSubscription<T::Hash>, Error> {
         let sub = self
             .client
             .subscribe(
-                "transactionWatch_unstable_submitAndWatch",
+                "transactionWatch_v1_submitAndWatch",
                 rpc_params![to_hex(tx)],
-                "transactionWatch_unstable_unwatch",
+                "transactionWatch_v1_unwatch",
             )
             .await?;
 
diff --git a/testing/integration-tests/src/full_client/client/unstable_rpcs.rs b/testing/integration-tests/src/full_client/client/unstable_rpcs.rs
index 9da3c33cc8..1a8feb960c 100644
--- a/testing/integration-tests/src/full_client/client/unstable_rpcs.rs
+++ b/testing/integration-tests/src/full_client/client/unstable_rpcs.rs
@@ -259,7 +259,7 @@ async fn chainspec_v1_properties() {
 
 #[cfg(fullclient)]
 #[subxt_test]
-async fn transaction_unstable_submit_and_watch() {
+async fn transaction_watch_v1_submit_and_watch() {
     let ctx = test_context().await;
     let rpc = ctx.unstable_rpc_methods().await;
 
@@ -274,7 +274,7 @@ async fn transaction_unstable_submit_and_watch() {
 
     // Test submitting it:
     let mut sub = rpc
-        .transaction_unstable_submit_and_watch(&tx_bytes)
+        .transaction_watch_v1_submit_and_watch(&tx_bytes)
         .await
         .unwrap();
 

From fe0d222307fb73f8c46c13a592fcb48fddccf380 Mon Sep 17 00:00:00 2001
From: Alexandru Vasile <alexandru.vasile@parity.io>
Date: Fri, 19 Apr 2024 11:51:18 +0300
Subject: [PATCH 2/2] Keep consistency in naming method class

Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io>
---
 subxt/src/backend/unstable/mod.rs                             | 2 +-
 subxt/src/backend/unstable/rpc_methods.rs                     | 2 +-
 .../integration-tests/src/full_client/client/unstable_rpcs.rs | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/subxt/src/backend/unstable/mod.rs b/subxt/src/backend/unstable/mod.rs
index 288598da8f..08e2ca3c66 100644
--- a/subxt/src/backend/unstable/mod.rs
+++ b/subxt/src/backend/unstable/mod.rs
@@ -477,7 +477,7 @@ impl<T: Config + Send + Sync + 'static> Backend<T> for UnstableBackend<T> {
         // Then, submit the transaction.
         let mut tx_progress = self
             .methods
-            .transaction_watch_v1_submit_and_watch(extrinsic)
+            .transactionwatch_v1_submit_and_watch(extrinsic)
             .await?;
 
         let mut seen_blocks = HashMap::new();
diff --git a/subxt/src/backend/unstable/rpc_methods.rs b/subxt/src/backend/unstable/rpc_methods.rs
index 8bf63a33e6..7e2106b098 100644
--- a/subxt/src/backend/unstable/rpc_methods.rs
+++ b/subxt/src/backend/unstable/rpc_methods.rs
@@ -272,7 +272,7 @@ impl<T: Config> UnstableRpcMethods<T> {
     }
 
     /// Attempt to submit a transaction, returning events about its progress.
-    pub async fn transaction_watch_v1_submit_and_watch(
+    pub async fn transactionwatch_v1_submit_and_watch(
         &self,
         tx: &[u8],
     ) -> Result<TransactionSubscription<T::Hash>, Error> {
diff --git a/testing/integration-tests/src/full_client/client/unstable_rpcs.rs b/testing/integration-tests/src/full_client/client/unstable_rpcs.rs
index 1a8feb960c..578e945400 100644
--- a/testing/integration-tests/src/full_client/client/unstable_rpcs.rs
+++ b/testing/integration-tests/src/full_client/client/unstable_rpcs.rs
@@ -259,7 +259,7 @@ async fn chainspec_v1_properties() {
 
 #[cfg(fullclient)]
 #[subxt_test]
-async fn transaction_watch_v1_submit_and_watch() {
+async fn transactionwatch_v1_submit_and_watch() {
     let ctx = test_context().await;
     let rpc = ctx.unstable_rpc_methods().await;
 
@@ -274,7 +274,7 @@ async fn transaction_watch_v1_submit_and_watch() {
 
     // Test submitting it:
     let mut sub = rpc
-        .transaction_watch_v1_submit_and_watch(&tx_bytes)
+        .transactionwatch_v1_submit_and_watch(&tx_bytes)
         .await
         .unwrap();