bet

djeck1432 · Mar 6, 2025 · f46aab8 · f46aab8
1 parent 7a2e8b9
commit f46aab8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/margin/src/margin.cairo b/margin/src/margin.cairo
@@ -9,13 +9,13 @@ pub mod Margin {
     };
     use margin::{
         interface::{
-            IMargin, IERC20MetadataForPragma, IERC20MetadataForPragmaDispatcher,
-            ,
+            IMargin, IERC20MetadataForPragma, IERC20MetadataForPragmaDispatcherTrait,
+            IERC20MetadataForPragmaDispatcher,
         },
         types::{Position, TokenAmount, PositionParameters},
     };
-    use margin::mocks::erc20_mock::{ERC20Mock, IERC20MetadataForPragmaImpl};
-    use alexandria_math::{BitShift, shl};
+    use margin::mocks::erc20_mock::{};
+    use alexandria_math::{BitShift, U256BitShift};
 
     use openzeppelin::token::erc20::interface::{IERC20Dispatcher};
     use margin::pragma::mock_get_data_median;
@@ -87,9 +87,12 @@ pub mod Margin {
             }
                 .symbol();
 
-            let pair_id = shl(token_symbol, 4) + '/USD';
+            let token_symbol_u256: u256 = token_symbol.into();
+            let pair_id = BitShift::shl(token_symbol_u256, 4) + '/USD';
 
-            return mock_get_data_median(1234, DataType::SpotEntry(pair_id));
+            return mock_get_data_median(
+                1234, DataType::SpotEntry(pair_id.try_into().expect('pair id overflows')),
+            );
         }
     }
 }
diff --git a/margin/src/mocks/erc20_mock.cairo b/margin/src/mocks/erc20_mock.cairo
@@ -35,7 +35,8 @@ pub mod ERC20Mock {
         self.erc20.mint(recipient, initial_supply);
     }
 
-    impl IERC20MetadataForPragmaImpl of IERC20MetadataForPragma<ContractState> {
+    #[embeddable_as(ERC20MetadataForPragmaImpl)]
+    impl ERC20MetadataForPragma of IERC20MetadataForPragma<ContractState> {
         fn name(self: @ContractState) -> ByteArray {
             self.erc20.ERC20_name.read()
         }