Merge branch 'release/0.4.8'

ferrumnet · Jul 4, 2023 · fa334c4 · fa334c4
2 parents 770559f + d1cf47d
commit fa334c4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -4,9 +4,6 @@ on:
     push:
         branches-ignore:
         - nightly
-    pull_request:
-        branches-ignore:
-        - nightly
 
 env:
   CARGO_TERM_COLOR: always

diff --git a/contract/src/bridge_pool_contract.rs b/contract/src/bridge_pool_contract.rs
@@ -162,10 +162,7 @@ pub trait BridgePoolContract<Storage: ContractStorage>: ContractContext<Storage>
         let actor = detail::get_immediate_caller_address()
             .unwrap_or_revert_with(Error::ImmediateCallerFail);
 
-        let client_address = detail::get_immediate_caller_address()
-            .unwrap_or_revert_with(Error::ImmediateCallerFail);
-
-        let client_address_string: String = client_address.try_into()?;
+        let client_address_string: String = actor.try_into()?;
 
         if receiver != client_address_string {
             return Err(Error::WrongCaller);
@@ -244,13 +241,12 @@ pub trait BridgePoolContract<Storage: ContractStorage>: ContractContext<Storage>
             return Err(Error::InvalidSigner);
         }
 
-        let client_addr = actor;
         runtime::call_versioned_contract::<()>(
             token,
             None,
             ERC20_ENTRY_POINT_TRANSFER,
             runtime_args! {
-                RECIPIENT => client_addr,
+                RECIPIENT => actor,
                 AMOUNT => amount
             },
         );