Only use litentry-primitives in worker (#2939)

litentry · Jul 29, 2024 · 3d3c4c8 · 3d3c4c8
1 parent a4bba37
commit 3d3c4c8
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 16 deletions.
diff --git a/bitacross-worker/Cargo.lock b/bitacross-worker/Cargo.lock
diff --git a/bitacross-worker/enclave-runtime/Cargo.lock b/bitacross-worker/enclave-runtime/Cargo.lock
diff --git a/bitacross-worker/litentry/core/direct-call/Cargo.toml b/bitacross-worker/litentry/core/direct-call/Cargo.toml
@@ -17,7 +17,6 @@ bc-signer-registry = { path = "../../../bitacross/core/bc-signer-registry", defa
 itp-sgx-crypto = { path = "../../../core-primitives/sgx/crypto", default-features = false }
 itp-stf-primitives = { path = "../../../core-primitives/stf-primitives", default-features = false }
 litentry-primitives = { path = "../../primitives", default-features = false }
-parentchain-primitives = { package = "core-primitives", path = "../../../../primitives/core", default-features = false }
 
 log = { version = "0.4", default-features = false }
 
@@ -33,7 +32,7 @@ itp-sgx-crypto = { path = "../../../core-primitives/sgx/crypto", features = ["mo
 [features]
 default = ["std"]
 development = [
-    "parentchain-primitives/development",
+    "litentry-primitives/development",
 ]
 sgx = [
     "sgx_tstd",
@@ -54,7 +53,6 @@ std = [
     "litentry-primitives/std",
     "sp-core/std",
     "sp-io/std",
-    "parentchain-primitives/std",
 ]
 test = [
     "itp-sgx-crypto/mocks",

diff --git a/bitacross-worker/litentry/core/direct-call/src/handler/kill_ceremony.rs b/bitacross-worker/litentry/core/direct-call/src/handler/kill_ceremony.rs
@@ -17,7 +17,7 @@
 use bc_enclave_registry::EnclaveRegistryLookup;
 use bc_musig2_ceremony::CeremonyCommand;
 use codec::Encode;
-use parentchain_primitives::Identity;
+use litentry_primitives::Identity;
 
 #[derive(Encode, Debug)]
 pub enum KillCeremonyError {

diff --git a/bitacross-worker/litentry/core/direct-call/src/handler/nonce_share.rs b/bitacross-worker/litentry/core/direct-call/src/handler/nonce_share.rs
@@ -18,8 +18,8 @@ use crate::handler::nonce_share::NonceShareError::InvalidSigner;
 use bc_enclave_registry::EnclaveRegistryLookup;
 use bc_musig2_ceremony::{CeremonyCommand, CeremonyId, PubNonce};
 use codec::Encode;
+use litentry_primitives::Identity;
 use log::debug;
-use parentchain_primitives::Identity;
 use std::sync::Arc;
 
 #[derive(Encode, Debug)]
@@ -59,7 +59,7 @@ pub mod test {
 	use bc_enclave_registry::{EnclaveRegistry, EnclaveRegistryUpdater};
 	use bc_musig2_ceremony::SignBitcoinPayload;
 	use itp_sgx_crypto::{key_repository::AccessKey, schnorr::Pair as SchnorrPair, Error};
-	use parentchain_primitives::Identity;
+	use litentry_primitives::Identity;
 	use sp_core::{sr25519, Pair};
 
 	struct SignerAccess {}

diff --git a/bitacross-worker/litentry/core/direct-call/src/handler/partial_signature_share.rs b/bitacross-worker/litentry/core/direct-call/src/handler/partial_signature_share.rs
@@ -18,8 +18,8 @@ use crate::handler::partial_signature_share::PartialSignatureShareError::Invalid
 use bc_enclave_registry::EnclaveRegistryLookup;
 use bc_musig2_ceremony::{CeremonyCommand, CeremonyId, PartialSignature};
 use codec::Encode;
+use litentry_primitives::Identity;
 use log::debug;
-use parentchain_primitives::Identity;
 use std::sync::Arc;
 
 #[derive(Encode, Debug)]
@@ -60,7 +60,7 @@ pub mod test {
 	use bc_enclave_registry::{EnclaveRegistry, EnclaveRegistryUpdater};
 	use bc_musig2_ceremony::SignBitcoinPayload;
 	use itp_sgx_crypto::{key_repository::AccessKey, schnorr::Pair as SchnorrPair, Error};
-	use parentchain_primitives::Identity;
+	use litentry_primitives::Identity;
 	use sp_core::{sr25519, Pair};
 
 	struct SignerAccess {}

diff --git a/bitacross-worker/litentry/core/direct-call/src/handler/sign_bitcoin.rs b/bitacross-worker/litentry/core/direct-call/src/handler/sign_bitcoin.rs
@@ -19,7 +19,7 @@ use bc_musig2_ceremony::{CeremonyCommand, PublicKey, SignBitcoinPayload, Signers
 use bc_relayer_registry::RelayerRegistryLookup;
 use bc_signer_registry::SignerRegistryLookup;
 use codec::Encode;
-use parentchain_primitives::Identity;
+use litentry_primitives::Identity;
 use std::sync::Arc;
 
 #[derive(Encode, Debug)]
@@ -68,7 +68,7 @@ pub mod test {
 	use bc_relayer_registry::{RelayerRegistry, RelayerRegistryUpdater};
 	use bc_signer_registry::{PubKey, SignerRegistryLookup};
 	use itp_sgx_crypto::{key_repository::AccessKey, schnorr::Pair as SchnorrPair, Error};
-	use parentchain_primitives::{Address32, Identity};
+	use litentry_primitives::{Address32, Identity};
 	use sp_core::{sr25519, Pair};
 
 	struct SignersRegistryMock {}

diff --git a/bitacross-worker/litentry/core/direct-call/src/handler/sign_ethereum.rs b/bitacross-worker/litentry/core/direct-call/src/handler/sign_ethereum.rs
@@ -18,8 +18,8 @@ use crate::PrehashedEthereumMessage;
 use bc_relayer_registry::RelayerRegistryLookup;
 use codec::Encode;
 use itp_sgx_crypto::{ecdsa::Pair, key_repository::AccessKey};
+use litentry_primitives::Identity;
 use log::error;
-use parentchain_primitives::Identity;
 
 #[derive(Encode, Debug)]
 pub enum SignEthereumError {
@@ -54,7 +54,7 @@ pub mod test {
 	use bc_relayer_registry::{RelayerRegistry, RelayerRegistryUpdater};
 	use itp_sgx_crypto::{ecdsa::Pair as EcdsaPair, mocks::KeyRepositoryMock};
 	use k256::{ecdsa::SigningKey, elliptic_curve::rand_core};
-	use parentchain_primitives::Identity;
+	use litentry_primitives::Identity;
 	use sp_core::{sr25519, Pair};
 
 	#[test]

diff --git a/bitacross-worker/litentry/core/direct-call/src/lib.rs b/bitacross-worker/litentry/core/direct-call/src/lib.rs
@@ -23,8 +23,7 @@ extern crate sgx_tstd as std;
 use bc_musig2_ceremony::SignBitcoinPayload;
 use codec::{Decode, Encode};
 use itp_stf_primitives::types::KeyPair;
-use litentry_primitives::{LitentryMultiSignature, RequestAesKey, ShardIdentifier};
-use parentchain_primitives::Identity;
+use litentry_primitives::{Identity, LitentryMultiSignature, RequestAesKey, ShardIdentifier};
 use sp_io::hashing::blake2_256;
 
 pub mod handler;