fix: renamed ekoke to ekoke-ledger

EKOKE-DAO · Feb 19, 2024 · c0b15ca · c0b15ca
1 parent b6bf33c
commit c0b15ca
Show file tree

Hide file tree

Showing 72 changed files with 802 additions and 150 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -4,7 +4,7 @@ members = [
   "src/did",
   "src/dip721",
   "src/deferred",
-  "src/ekoke",
+  "src/ekoke_ledger",
   "src/icrc",
   "src/marketplace",
   "src/xrc",

diff --git a/Makefile.toml b/Makefile.toml
@@ -52,17 +52,22 @@ args = ["fmt", "--all", "--", "--check"]
 
 [tasks.did]
 description = "Generate did files"
-dependencies = ["deferred-did", "ekoke-did", "marketplace-did", "dfx-generate"]
+dependencies = [
+  "deferred-did",
+  "ekoke-ledger-did",
+  "marketplace-did",
+  "dfx-generate",
+]
 workspace = false
 
 [tasks.deferred-did]
 description = "Generate did files for deferred"
 script = "cargo run --bin deferred-did  --features did > src/deferred/deferred.did"
 workspace = false
 
-[tasks.ekoke-did]
-description = "Generate did files for ekoke"
-script = "cargo run --bin ekoke-did  --features did > src/ekoke/ekoke.did"
+[tasks.ekoke-ledger-did]
+description = "Generate did files for ekoke-ledger"
+script = "cargo run --bin ekoke-ledger-did  --features did > src/ekoke_ledger/ekoke-ledger.did"
 workspace = false
 
 [tasks.marketplace-did]
@@ -78,5 +83,5 @@ workspace = false
 
 [tasks.dfx-setup]
 description = "setup dfx"
-script = "dfx stop; dfx start --background; dfx canister create deferred; dfx canister create ekoke; dfx canister create marketplace"
+script = "dfx stop; dfx start --background; dfx canister create deferred; dfx canister create ekoke-ledger; dfx canister create marketplace"
 workspace = false
diff --git a/dfx.json b/dfx.json
@@ -5,9 +5,9 @@
       "package": "deferred",
       "type": "rust"
     },
-    "ekoke": {
-      "candid": "src/ekoke/ekoke.did",
-      "package": "ekoke",
+    "ekoke-ledger": {
+      "candid": "src/ekoke_ledger/ekoke-ledger.did",
+      "package": "ekoke_ledger",
       "type": "rust"
     },
     "marketplace": {

diff --git a/integration-tests/src/client/ekoke.rs b/integration-tests/src/client/ekoke.rs
@@ -28,7 +28,7 @@ impl<'a> EkokeClient<'a> {
     ) -> EkokeResult<PicoEkoke> {
         self.env
             .update(
-                self.env.ekoke_id,
+                self.env.ekoke_ledger_id,
                 from.owner,
                 "reserve_pool",
                 Encode!(&contract_id, &picoekoke_amount, &from.subaccount).unwrap(),
@@ -39,7 +39,7 @@ impl<'a> EkokeClient<'a> {
     pub fn send_reward(&self, contract_id: ID, amount: PicoEkoke, to: Account) -> EkokeResult<()> {
         self.env
             .update(
-                self.env.ekoke_id,
+                self.env.ekoke_ledger_id,
                 self.env.marketplace_id,
                 "send_reward",
                 Encode!(&contract_id, &amount, &to).unwrap(),

diff --git a/integration-tests/src/lib.rs b/integration-tests/src/lib.rs
@@ -32,7 +32,7 @@ pub struct TestEnv {
     pub cketh_minter_id: Principal,
     pub ckbtc_id: Principal,
     pub deferred_id: Principal,
-    pub ekoke_id: Principal,
+    pub ekoke_ledger_id: Principal,
     pub icp_ledger_id: Principal,
     pub marketplace_id: Principal,
     pub xrc_id: Principal,
@@ -103,19 +103,19 @@ impl TestEnv {
         let cketh_minter_id = pic.create_canister();
         let xrc_id = pic.create_canister();
         let deferred_id = pic.create_canister();
-        let ekoke_id = pic.create_canister();
+        let ekoke_ledger_id = pic.create_canister();
         let marketplace_id = pic.create_canister();
 
         // install deferred canister
         Self::install_icrc2(&pic, icp_ledger_id, "ICP", "Internet Computer", 8);
         Self::install_icrc2(&pic, ckbtc_id, "ckBTC", "ckBTC", 8);
         Self::install_icrc2(&pic, cketh_ledger_id, "ckETH", "ckETH", 18);
         // TODO: install ckETH minter
-        Self::install_deferred(&pic, deferred_id, ekoke_id, marketplace_id);
+        Self::install_deferred(&pic, deferred_id, ekoke_ledger_id, marketplace_id);
         Self::install_xrc(&pic, xrc_id);
-        Self::install_ekoke(
+        Self::install_ekoke_ledger(
             &pic,
-            ekoke_id,
+            ekoke_ledger_id,
             deferred_id,
             marketplace_id,
             xrc_id,
@@ -128,7 +128,7 @@ impl TestEnv {
             &pic,
             marketplace_id,
             deferred_id,
-            ekoke_id,
+            ekoke_ledger_id,
             xrc_id,
             icp_ledger_id,
         );
@@ -140,7 +140,7 @@ impl TestEnv {
             ckbtc_id,
             deferred_id,
             icp_ledger_id,
-            ekoke_id,
+            ekoke_ledger_id,
             marketplace_id,
             xrc_id,
         }
@@ -229,15 +229,15 @@ impl TestEnv {
     fn install_deferred(
         pic: &PocketIc,
         deferred_id: Principal,
-        ekoke_id: Principal,
+        ekoke_ledger_id: Principal,
         marketplace_id: Principal,
     ) {
         pic.add_cycles(deferred_id, DEFAULT_CYCLES);
         let wasm_bytes = Self::load_wasm(Canister::Deferred);
 
         let init_arg = DeferredInitData {
             custodians: vec![actor::admin()],
-            ekoke_canister: ekoke_id,
+            ekoke_ledger_canister: ekoke_ledger_id,
             marketplace_canister: marketplace_id,
         };
         let init_arg = Encode!(&init_arg).unwrap();
@@ -246,9 +246,9 @@ impl TestEnv {
     }
 
     #[allow(clippy::too_many_arguments)]
-    fn install_ekoke(
+    fn install_ekoke_ledger(
         pic: &PocketIc,
-        ekoke_id: Principal,
+        ekoke_ledger_id: Principal,
         deferred_id: Principal,
         marketplace_id: Principal,
         xrc_canister: Principal,
@@ -257,8 +257,8 @@ impl TestEnv {
         cketh_ledger_canister: Principal,
         cketh_minter_canister: Principal,
     ) {
-        pic.add_cycles(ekoke_id, DEFAULT_CYCLES);
-        let wasm_bytes = Self::load_wasm(Canister::Ekoke);
+        pic.add_cycles(ekoke_ledger_id, DEFAULT_CYCLES);
+        let wasm_bytes = Self::load_wasm(Canister::EkokeLedger);
 
         let init_arg = EkokeInitData {
             admins: vec![actor::admin()],
@@ -283,14 +283,14 @@ impl TestEnv {
         };
         let init_arg = Encode!(&init_arg).unwrap();
 
-        pic.install_canister(ekoke_id, wasm_bytes, init_arg, None);
+        pic.install_canister(ekoke_ledger_id, wasm_bytes, init_arg, None);
     }
 
     fn install_marketplace(
         pic: &PocketIc,
         marketplace_id: Principal,
         deferred_id: Principal,
-        ekoke_id: Principal,
+        ekoke_ledger_id: Principal,
         xrc_canister: Principal,
         icp_ledger_canister: Principal,
     ) {
@@ -300,7 +300,7 @@ impl TestEnv {
         let init_arg = MarketplaceInitData {
             admins: vec![actor::admin()],
             deferred_canister: deferred_id,
-            ekoke_canister: ekoke_id,
+            ekoke_ledger_canister: ekoke_ledger_id,
             xrc_canister,
             icp_ledger_canister,
         };

diff --git a/integration-tests/src/wasm.rs b/integration-tests/src/wasm.rs
@@ -18,7 +18,7 @@ pub struct Icrc2InitArgs {
 
 pub enum Canister {
     Deferred,
-    Ekoke,
+    EkokeLedger,
     Icrc2,
     Marketplace,
     Xrc,
@@ -28,7 +28,9 @@ impl Canister {
     pub fn as_path(&self) -> &'static Path {
         match self {
             Canister::Deferred => Path::new("../.dfx/local/canisters/deferred/deferred.wasm"),
-            Canister::Ekoke => Path::new("../.dfx/local/canisters/ekoke/ekoke.wasm"),
+            Canister::EkokeLedger => {
+                Path::new("../.dfx/local/canisters/ekoke-ledger/ekoke-ledger.wasm")
+            }
             Canister::Marketplace => {
                 Path::new("../.dfx/local/canisters/marketplace/marketplace.wasm")
             }

diff --git a/integration-tests/tests/http/ekoke.rs b/integration-tests/tests/http/ekoke.rs
@@ -7,12 +7,12 @@ use integration_tests::TestEnv;
 fn test_should_get_liquidity_pool_accounts_and_balance() {
     let env = TestEnv::init();
 
-    let http_client = HttpClient::new(env.ekoke_id, &env);
+    let http_client = HttpClient::new(env.ekoke_ledger_id, &env);
     let liquidity_pool_accounts: LiquidityPoolAccounts =
         http_client.http_request("liquidityPoolAccounts", serde_json::json!({}));
 
-    assert_eq!(liquidity_pool_accounts.ckbtc.owner, env.ekoke_id);
-    assert_eq!(liquidity_pool_accounts.icp.owner, env.ekoke_id);
+    assert_eq!(liquidity_pool_accounts.ckbtc.owner, env.ekoke_ledger_id);
+    assert_eq!(liquidity_pool_accounts.icp.owner, env.ekoke_ledger_id);
 
     let liquidity_pool_balance: LiquidityPoolBalance =
         http_client.http_request("liquidityPoolBalance", serde_json::json!({}));

diff --git a/integration-tests/tests/inspect/deferred.rs b/integration-tests/tests/inspect/deferred.rs
@@ -15,7 +15,7 @@ fn test_should_inspect_is_admin() {
         .update::<()>(
             env.deferred_id,
             admin(),
-            "admin_set_ekoke_canister",
+            "admin_set_ekoke_ledger_canister",
             Encode!(&env.marketplace_id).unwrap(),
         )
         .is_ok());
@@ -30,7 +30,7 @@ fn test_should_inspect_admin_not_admin() {
         .update::<()>(
             env.deferred_id,
             bob(),
-            "admin_set_ekoke_canister",
+            "admin_set_ekoke_ledger_canister",
             Encode!(&env.marketplace_id).unwrap(),
         )
         .is_err());