remove unnecessary error module and fix token-client dependency

samkim-crypto · samkim-crypto · commit d5890aa3aeb8 · 2024-10-15T18:49:40.000+09:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/token/client/Cargo.toml b/token/client/Cargo.toml
@@ -27,6 +27,7 @@ spl-record = { version = "0.2.1", path = "../../record/program", features = ["no
 spl-token = { version = "6.0", path = "../program", features = [
   "no-entrypoint",
 ] }
+spl-token-confidential-transfer-proof-extraction = { version = "0.1.0", path = "../confidential-transfer/proof-extraction" }
 spl-token-confidential-transfer-proof-generation = { version = "0.1.0", path = "../confidential-transfer/proof-generation" }
 spl-token-2022 = { version = "5.0.2", path = "../program-2022" }
 spl-token-group-interface = { version = "0.4.2", path = "../../token-group/interface" }
diff --git a/token/client/src/token.rs b/token/client/src/token.rs
@@ -47,7 +47,6 @@ use {
             BaseStateWithExtensions, Extension, ExtensionType, StateWithExtensionsOwned,
         },
         instruction, offchain,
-        proof::{zk_proof_type_to_instruction, ProofData, ProofLocation},
         solana_zk_sdk::{
             encryption::{
                 auth_encryption::AeKey,
@@ -63,6 +62,9 @@ use {
         },
         state::{Account, AccountState, Mint, Multisig},
     },
+    spl_token_confidential_transfer_proof_extraction::{
+        zk_proof_type_to_instruction, ProofData, ProofLocation,
+    },
     spl_token_confidential_transfer_proof_generation::{
         transfer::TransferProofData, transfer_with_fee::TransferWithFeeProofData,
         withdraw::WithdrawProofData,
diff --git a/token/confidential-transfer/elgamal-registry/src/lib.rs b/token/confidential-transfer/elgamal-registry/src/lib.rs
@@ -1,5 +1,4 @@
 mod entrypoint;
-pub mod error;
 pub mod instruction;
 pub mod processor;
 pub mod state;

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`mod entrypoint;`
`2`		`-pub mod error;`
`3`	`2`	`pub mod instruction;`
`4`	`3`	`pub mod processor;`
`5`	`4`	`pub mod state;`