resolved merge conflict & fixed warnings

Author: xdecentralix

crates/contracts/build.rs

@@ -11,6 +11,7 @@ use {
 mod paths;
 
 const MAINNET: &str = "1";
+const GOERLI: &str = "5";
 const OPTIMISM: &str = "10";
 const BNB: &str = "56";
 const GNOSIS: &str = "100";

crates/shared/src/sources/balancer_v2/swap/mod.rs

@@ -755,7 +755,7 @@ impl BaselineSolvable for GyroEPoolRef<'_> {
 }
 
 impl GyroEPool {
-    fn as_pool_ref(&self) -> GyroEPoolRef {
+    fn as_pool_ref(&self) -> GyroEPoolRef<'_> {
         GyroEPoolRef {
             reserves: &self.reserves,
             swap_fee: self.common.swap_fee,

crates/shared/src/sources/balancer_v3/swap/mod.rs

@@ -435,7 +435,7 @@ fn converge_in_amount(
 }
 
 impl WeightedPool {
-    fn as_pool_ref(&self) -> WeightedPoolRef {
+    fn as_pool_ref(&self) -> WeightedPoolRef<'_> {
         WeightedPoolRef {
             reserves: &self.reserves,
             swap_fee: self.common.swap_fee,
@@ -459,7 +459,7 @@ impl BaselineSolvable for WeightedPool {
 }
 
 impl StablePool {
-    fn as_pool_ref(&self) -> StablePoolRef {
+    fn as_pool_ref(&self) -> StablePoolRef<'_> {
         StablePoolRef {
             address: self.common.address,
             reserves: &self.reserves,
@@ -745,7 +745,7 @@ impl BaselineSolvable for GyroEPoolRef<'_> {
 }
 
 impl GyroEPool {
-    fn as_pool_ref(&self) -> GyroEPoolRef {
+    fn as_pool_ref(&self) -> GyroEPoolRef<'_> {
         GyroEPoolRef {
             reserves: &self.reserves,
             swap_fee: self.common.swap_fee,