addressed some comments

axelarnetwork · Oct 25, 2024 · d7b01b6 · d7b01b6
1 parent d787666
commit d7b01b6
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 58 deletions.
diff --git a/move/example/sources/squid/a.move → move/example/sources/squid/token_a.move b/move/example/sources/squid/a.move → move/example/sources/squid/token_a.move
@@ -1,21 +1,21 @@
-module example::a;
+module example::token_a;
 
 use sui::coin;
 
 // ------------
 // Capabilities
 // ------------
-public struct A has drop {}
+public struct TOKEN_A has drop {}
 
 // -----
 // Setup
 // -----
-fun init(witness: A, ctx: &mut TxContext) {
+fun init(witness: TOKEN_A, ctx: &mut TxContext) {
     let (treasury_cap, coin_metadata) = coin::create_currency(
         witness,
         9,
-        b"ITS",
-        b"ITS Example Coin",
+        b"TOKEN1",
+        b"Token 1",
         b"",
         option::none(),
         ctx,

diff --git a/move/example/sources/squid/b.move → move/example/sources/squid/token_b.move b/move/example/sources/squid/b.move → move/example/sources/squid/token_b.move
@@ -1,21 +1,21 @@
-module example::b;
+module example::token_b;
 
 use sui::coin;
 
 // ------------
 // Capabilities
 // ------------
-public struct B has drop {}
+public struct TOKEN_B has drop {}
 
 // -----
 // Setup
 // -----
-fun init(witness: B, ctx: &mut TxContext) {
+fun init(witness: TOKEN_B, ctx: &mut TxContext) {
     let (treasury_cap, coin_metadata) = coin::create_currency(
         witness,
         9,
-        b"ITS",
-        b"ITS Example Coin",
+        b"TOKEN2",
+        b"Token 2",
         b"",
         option::none(),
         ctx,

diff --git a/move/example/sources/squid/c.move → move/example/sources/squid/token_c.move b/move/example/sources/squid/c.move → move/example/sources/squid/token_c.move
@@ -1,21 +1,21 @@
-module example::c;
+module example::token_c;
 
 use sui::coin;
 
 // ------------
 // Capabilities
 // ------------
-public struct C has drop {}
+public struct TOKEN_C has drop {}
 
 // -----
 // Setup
 // -----
-fun init(witness: C, ctx: &mut TxContext) {
+fun init(witness: TOKEN_C, ctx: &mut TxContext) {
     let (treasury_cap, coin_metadata) = coin::create_currency(
         witness,
         9,
-        b"ITS",
-        b"ITS Example Coin",
+        b"TOKEN3",
+        b"Token 3",
         b"",
         option::none(),
         ctx,

diff --git a/move/squid/sources/squid/deepbook_v3.move b/move/squid/sources/squid/deepbook_v3.move
@@ -259,7 +259,7 @@ public(package) fun swap_move_call(
 }
 
 public(package) fun peel_swap_data(bcs: &mut BCS): DeepbookV3SwapData {
-    let data = DeepbookV3SwapData {
+    DeepbookV3SwapData {
         swap_type: swap_type::peel(bcs),
         pool_id: bcs.peel_address(),
         has_base: bcs.peel_bool(),
@@ -268,8 +268,7 @@ public(package) fun peel_swap_data(bcs: &mut BCS): DeepbookV3SwapData {
         quote_type: ascii::string(bcs.peel_vec_u8()),
         lot_size: bcs.peel_u64(),
         should_sweep: bcs.peel_bool(),
-    };
-    data
+    }
 }
 
 /// Multiply two u64 numbers and divide by FLOAT_SCALING. Rounded down.

diff --git a/move/squid/sources/squid/discovery.move b/move/squid/sources/squid/discovery.move
@@ -104,8 +104,8 @@ public fun transaction(
         move_calls.push_back(call);
     });
 
-    swap_data.do_ref!(|data| {
-        let mut bcs = bcs::new(*data);
+    swap_data.do!(|data| {
+        let mut bcs = bcs::new(data);
         let swap_type = swap_type::peel(&mut bcs);
 
         let call = if (swap_type == swap_type::deepbook_v3()) {

diff --git a/move/squid/sources/squid/squid.move b/move/squid/sources/squid/squid.move
@@ -60,6 +60,13 @@ public(package) macro fun value_mut(
     value
 }
 
+// ---------------
+// Entry Functions
+// ---------------
+entry fun give_deep(self: &mut Squid, deep: Coin<DEEP>) {
+    self.value_mut!(b"give_deep").give_deep(deep);
+}
+
 // ----------------
 // Public Functions
 // ----------------
@@ -79,10 +86,6 @@ public fun finalize(swap_info: SwapInfo) {
     swap_info.finalize();
 }
 
-entry fun give_deep(self: &mut Squid, deep: Coin<DEEP>) {
-    self.value_mut!(b"give_deep").give_deep(deep);
-}
-
 // -----------------
 // Package Functions
 // -----------------

diff --git a/test/squid.js b/test/squid.js
@@ -29,7 +29,7 @@ const { keccak256, defaultAbiCoder, hexlify, randomBytes } = require('ethers/lib
 
 const SUI = '0x2';
 
-describe('Squid', () => {
+describe.only('Squid', () => {
     // Sui Client
     let client;
     const network = process.env.NETWORK || 'localnet';
@@ -196,21 +196,6 @@ describe('Squid', () => {
         });
 
         await builder.signAndExecute(deployer);
-        /* place_limit_order<BaseAsset, QuoteAsset>(
-            self: &mut Pool<BaseAsset, QuoteAsset>,
-            balance_manager: &mut BalanceManager,
-            trade_proof: &TradeProof,
-            client_order_id: u64,
-            order_type: u8,
-            self_matching_option: u8,
-            price: u64,
-            quantity: u64,
-            is_bid: bool,
-            pay_with_deep: bool,
-            expire_timestamp: u64,
-            clock: &Clock,
-            ctx: &TxContext,
-        ) */
     }
 
     async function registerCoin(coin) {
@@ -292,24 +277,14 @@ describe('Squid', () => {
             itsChannel: await getVersionedChannelId(client, objectIds.itsV0),
             squidChannel: await getVersionedChannelId(client, objectIds.squidV0),
         };
-        let type = `${deployments.example.packageId}::a::A`;
-        coins.a = {
-            treasuryCap: findObjectId(deployments.example.publishTxn, `TreasuryCap<${type}>`),
-            coinMetadata: findObjectId(deployments.example.publishTxn, `CoinMetadata<${type}>`),
-            type,
-        };
-        type = `${deployments.example.packageId}::b::B`;
-        coins.b = {
-            treasuryCap: findObjectId(deployments.example.publishTxn, `TreasuryCap<${type}>`),
-            coinMetadata: findObjectId(deployments.example.publishTxn, `CoinMetadata<${type}>`),
-            type,
-        };
-        type = `${deployments.example.packageId}::c::C`;
-        coins.c = {
-            treasuryCap: findObjectId(deployments.example.publishTxn, `TreasuryCap<${type}>`),
-            coinMetadata: findObjectId(deployments.example.publishTxn, `CoinMetadata<${type}>`),
-            type,
-        };
+        for(token of ['a', 'b', 'c']) {  
+            const type = `${deployments.example.packageId}::${token}::${token.toUpperCase()}`;
+            coins[token] = {
+                treasuryCap: findObjectId(deployments.example.publishTxn, `TreasuryCap<${type}>`),
+                coinMetadata: findObjectId(deployments.example.publishTxn, `CoinMetadata<${type}>`),
+                type,
+            };
+        }
 
         pools.ab = await createPool('a', 'b');
         pools.bc = await createPool('b', 'c');