chore: fix dependency

sidan-lab · Aug 20, 2024 · 1722fa3 · 1722fa3
1 parent f891125
commit 1722fa3
Show file tree

Hide file tree

Showing 13 changed files with 31 additions and 22 deletions.
diff --git a/packages/Cargo.lock b/packages/Cargo.lock
diff --git a/packages/sidan-csl-rs/Cargo.toml b/packages/sidan-csl-rs/Cargo.toml
@@ -10,7 +10,7 @@ crate-type = ["cdylib", "rlib"]
 
 [dependencies]
 getrandom = { version = "0.2", features = ["js"] }
-cardano-serialization-lib = "12.0.0-beta.6"
+cardano-serialization-lib = "12.0.0-beta.7"
 hex = "0.4"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"

diff --git a/packages/whisky/Cargo.toml b/packages/whisky/Cargo.toml
@@ -10,7 +10,6 @@ crate-type = ["cdylib", "rlib"]
 
 [dependencies]
 getrandom = { version = "0.2", features = ["js"] }
-cardano-serialization-lib = "12.0.0-beta.7"
 hex = "0.4"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"

diff --git a/packages/whisky/src/builder/complete.rs b/packages/whisky/src/builder/complete.rs
@@ -1,6 +1,8 @@
-use cardano_serialization_lib::JsError;
 use sidan_csl_rs::{
-    core::builder::serialize_tx_body, core::utils::build_tx_builder, csl, model::*,
+    core::builder::serialize_tx_body,
+    core::utils::build_tx_builder,
+    csl::{self, JsError},
+    model::*,
 };
 
 use super::{MeshTxBuilder, TxEvaluation};

diff --git a/packages/whisky/src/builder/data.rs b/packages/whisky/src/builder/data.rs
@@ -1,5 +1,5 @@
 use crate::*;
-use cardano_serialization_lib::JsError;
+use csl::JsError;
 use model::Budget;
 
 #[derive(Clone, Debug)]

diff --git a/packages/whisky/src/builder/mod.rs b/packages/whisky/src/builder/mod.rs
@@ -9,9 +9,12 @@ mod withdrawal;
 
 use std::collections::HashMap;
 
-use cardano_serialization_lib::JsError;
 pub use data::*;
-use sidan_csl_rs::{core::algo::select_utxos, core::builder::*, model::*};
+use sidan_csl_rs::{
+    core::{algo::select_utxos, builder::*},
+    csl::JsError,
+    model::*,
+};
 pub use tx_eval::*;
 
 use crate::service::*;

diff --git a/packages/whisky/src/builder/tx_eval.rs b/packages/whisky/src/builder/tx_eval.rs
@@ -1,9 +1,8 @@
 use async_trait::async_trait;
-use cardano_serialization_lib as csl;
-use csl::JsError;
 use pallas_primitives::alonzo::RedeemerTag as PRedeemerTag;
 use pallas_primitives::conway::PlutusV2Script;
 use sidan_csl_rs::core::constants::get_cost_models_from_network;
+use sidan_csl_rs::csl::{self, JsError};
 use std::collections::HashMap;
 use uplc::tx::SlotConfig;
 use uplc::Fragment;

diff --git a/packages/whisky/src/service/evaluator.rs b/packages/whisky/src/service/evaluator.rs
@@ -1,9 +1,11 @@
 use async_trait::async_trait;
-use cardano_serialization_lib::JsError;
 
-use sidan_csl_rs::model::{
-    Action, Certificate, MintItem, Network, Redeemer, RedeemerTag, ScriptTxIn, TxIn, UTxO,
-    Withdrawal,
+use sidan_csl_rs::{
+    csl::JsError,
+    model::{
+        Action, Certificate, MintItem, Network, Redeemer, RedeemerTag, ScriptTxIn, TxIn, UTxO,
+        Withdrawal,
+    },
 };
 
 use crate::builder::MeshTxBuilder;

diff --git a/packages/whisky/src/transaction/inputs.rs b/packages/whisky/src/transaction/inputs.rs
@@ -1,6 +1,6 @@
-use cardano_serialization_lib::JsError;
 use sidan_csl_rs::{
     core::utils::get_script_hash,
+    csl::JsError,
     model::{LanguageVersion, UTxO},
 };
 

diff --git a/packages/whisky/src/transaction/mints.rs b/packages/whisky/src/transaction/mints.rs
@@ -1,5 +1,7 @@
-use cardano_serialization_lib::JsError;
-use sidan_csl_rs::model::{LanguageVersion, MintParameter};
+use sidan_csl_rs::{
+    csl::JsError,
+    model::{LanguageVersion, MintParameter},
+};
 
 use crate::builder::WRedeemer;
 

diff --git a/packages/whisky/src/transaction/mod.rs b/packages/whisky/src/transaction/mod.rs
@@ -1,4 +1,4 @@
-use cardano_serialization_lib::JsError;
+use sidan_csl_rs::csl::JsError;
 
 use crate::builder::MeshTxBuilder;
 

diff --git a/packages/whisky/src/transaction/withdrawal.rs b/packages/whisky/src/transaction/withdrawal.rs
@@ -1,5 +1,4 @@
-use cardano_serialization_lib::JsError;
-use sidan_csl_rs::model::LanguageVersion;
+use sidan_csl_rs::{csl::JsError, model::LanguageVersion};
 
 use crate::builder::WRedeemer;
 
@@ -25,7 +24,11 @@ impl WhiskyTx {
 #[cfg(test)]
 mod tests {
     use serde_json::json;
-    use sidan_csl_rs::{core::common::con_str0, model::Budget, model::LanguageVersion};
+    use sidan_csl_rs::{
+        core::common::con_str0,
+        csl::JsError,
+        model::{Budget, LanguageVersion},
+    };
 
     use crate::builder::{WData, WRedeemer};
 

diff --git a/packages/whisky/src/utils/blueprint.rs b/packages/whisky/src/utils/blueprint.rs
@@ -1,8 +1,8 @@
-use cardano_serialization_lib::JsError;
 use sidan_csl_rs::{
     core::utils::{
         apply_params_to_script, get_script_hash, script_hash_to_stake_address, script_to_address,
     },
+    csl::JsError,
     model::{BuilderDataType, LanguageVersion},
 };