Merge remote-tracking branch 'origin/main'

# Conflicts: # src/lib.rs # src/models.rs # tests/clients_tests/helpers/wallet.rs
monero-rs · Oct 24, 2023 · c3cdd15 · c3cdd15
2 parents 8e0cd83 + 0a95362
commit c3cdd15
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 24 deletions.
diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
@@ -9,11 +9,11 @@ jobs:
   create_release:
     name: Create from merged release branch
     if: github.event.pull_request.merged == true && startsWith(github.event.pull_request.head.ref, 'release/')
-    uses: monero-rs/workflows/.github/workflows/[email protected].2
+    uses: monero-rs/workflows/.github/workflows/[email protected].3
 
   release_to_crates:
     name: Publish the new release to crates.io
-    uses: monero-rs/workflows/.github/workflows/[email protected].2
+    uses: monero-rs/workflows/.github/workflows/[email protected].3
     # Do not run before creating the release is done
     needs: create_release
     secrets:

diff --git a/.github/workflows/draft-new-release.yml b/.github/workflows/draft-new-release.yml
@@ -10,7 +10,7 @@ on:
 jobs:
   draft-new-release:
     name: Draft a new release
-    uses: monero-rs/workflows/.github/workflows/[email protected].2
+    uses: monero-rs/workflows/.github/workflows/[email protected].3
     with:
       version: ${{ github.event.inputs.version }}
       base_branch: 'main'
diff --git a/.github/workflows/release-to-crates-io.yml b/.github/workflows/release-to-crates-io.yml
@@ -8,7 +8,7 @@ on:
 jobs:
   release_to_crates:
     name: Publish the new release to crates.io
-    uses: monero-rs/workflows/.github/workflows/[email protected].2
+    uses: monero-rs/workflows/.github/workflows/[email protected].3
     secrets:
       cratesio_token: ${{ secrets.H4SH3D_CARGO_REGISTRY_TOKEN }}
 
diff --git a/src/lib.rs b/src/lib.rs
@@ -1410,27 +1410,7 @@ impl WalletClient {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use monero::{KeyPair, Network, PrivateKey};
     use serde_test::{assert_de_tokens_error, assert_ser_tokens, assert_tokens, Token};
-    use std::str::FromStr;
-
-    #[test]
-    fn address_to_string() {
-        let key_pair_1 = KeyPair {
-            view: PrivateKey::from_str(
-                "8ae33e57aee12fa4ad5b42a3ab093d9f3cb7f9be68b112a85f83275bcc5a190b",
-            )
-            .unwrap(),
-            spend: PrivateKey::from_str(
-                "eae5d41a112e14dcd549780a982bb3653c2f86ab1f4e6aa2b13c41f8b893ab04",
-            )
-            .unwrap(),
-        };
-        let addr = Address::from_keypair(Network::Mainnet, &key_pair_1);
-
-        //let txid: HashString<Vec<u8>> = "19d5089f9469db3d90aca9024dfcb17ce94b948300101c8345a5e9f7257353be";
-        //println!("{:?}", addr.to_string());
-    }
 
     #[test]
     fn rpc_params_array() {

diff --git a/tests/clients_tests/helpers/wallet.rs b/tests/clients_tests/helpers/wallet.rs
@@ -781,3 +781,4 @@ pub async fn create_check_tx_proof_assert_ok(
     assert!(check_res.is_ok());
     assert!(check_res.unwrap().good);
 }
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -781,3 +781,4 @@ pub async fn create_check_tx_proof_assert_ok(
		assert!(check_res.is_ok());
		assert!(check_res.unwrap().good);
		}