From 59b2d59eeb9cdb745d233a17623de657c8a55358 Mon Sep 17 00:00:00 2001 From: Jun Kimura Date: Thu, 24 Nov 2022 10:22:52 +0900 Subject: [PATCH] fix to linters check tests Signed-off-by: Jun Kimura --- Cargo.lock | 24 ------------------------ Makefile | 4 ++-- modules/ibc-client/Cargo.toml | 2 -- tests/integration/Cargo.toml | 2 -- tests/integration/src/lib.rs | 6 ++---- 5 files changed, 4 insertions(+), 34 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 745a684d..f90abe39 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1942,23 +1942,6 @@ dependencies = [ "uint", ] -[[package]] -name = "ibc-integration-test" -version = "0.16.0" -source = "git+https://github.com/informalsystems/ibc-rs?rev=e8c98d440949abf971ac45a68ed9dd9e6e9f48ed#e8c98d440949abf971ac45a68ed9dd9e6e9f48ed" -dependencies = [ - "ibc", - "ibc-proto", - "ibc-relayer", - "ibc-relayer-cli", - "ibc-test-framework", - "serde", - "serde_json", - "tendermint", - "tendermint-rpc", - "time", -] - [[package]] name = "ibc-proto" version = "0.19.0" @@ -2223,7 +2206,6 @@ dependencies = [ "host", "host-environment", "ibc", - "ibc-integration-test", "ibc-proto", "ibc-relayer", "ibc-test-framework", @@ -2233,7 +2215,6 @@ dependencies = [ "once_cell 1.15.0", "prost-types", "relay-tendermint", - "settings", "store", "tempdir", "tendermint-proto", @@ -2298,9 +2279,6 @@ name = "lazy_static" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -dependencies = [ - "spin", -] [[package]] name = "lazycell" @@ -2339,11 +2317,9 @@ dependencies = [ "commitments", "context", "crypto", - "ecall-commands", "flex-error", "ibc", "ibc-proto", - "lazy_static", "lcp-proto", "lcp-types", "light-client", diff --git a/Makefile b/Makefile index f9dc33e2..08c948a3 100644 --- a/Makefile +++ b/Makefile @@ -190,8 +190,8 @@ yrly: .PHONY: lint lint: - @cargo check --locked $(CARGO_TARGET) - @cargo udeps --locked --lib --quiet $(CARGO_TARGET) + @cargo check --locked --tests $(CARGO_TARGET) + @cargo udeps --locked --lib --tests --quiet $(CARGO_TARGET) .PHONY: test test: diff --git a/modules/ibc-client/Cargo.toml b/modules/ibc-client/Cargo.toml index 1701e50f..0b4b7c18 100644 --- a/modules/ibc-client/Cargo.toml +++ b/modules/ibc-client/Cargo.toml @@ -24,12 +24,10 @@ lcp-proto = { path = "../../proto", default-features = false } crypto = { path = "../crypto", default-features = false } [dev-dependencies] -lazy_static = { version = "1.1.0", features = ["spin_no_std"] } tempdir = "0.3.7" mock-lc = { path = "../mock-lc" } store = { path = "../store" } context = { path = "../context" } -ecall-commands = { path = "../ecall-commands" } light-client-registry = { path = "../light-client-registry", default-features = false } crypto = { path = "../crypto", default-features = false, features = ["std"] } diff --git a/tests/integration/Cargo.toml b/tests/integration/Cargo.toml index 6fff3c39..5c763d38 100644 --- a/tests/integration/Cargo.toml +++ b/tests/integration/Cargo.toml @@ -8,7 +8,6 @@ build = "build.rs" ibc = { git = "https://github.com/informalsystems/ibc-rs", rev = "e8c98d440949abf971ac45a68ed9dd9e6e9f48ed", default-features = false } ibc-relayer = { git = "https://github.com/informalsystems/ibc-rs", rev = "e8c98d440949abf971ac45a68ed9dd9e6e9f48ed", default-features = false } ibc-proto = { git = "https://github.com/informalsystems/ibc-rs", rev = "e8c98d440949abf971ac45a68ed9dd9e6e9f48ed", default-features = false } -ibc-integration-test = { git = "https://github.com/informalsystems/ibc-rs", rev = "e8c98d440949abf971ac45a68ed9dd9e6e9f48ed", default-features = false } ibc-test-framework = { git = "https://github.com/informalsystems/ibc-rs", rev = "e8c98d440949abf971ac45a68ed9dd9e6e9f48ed", default-features = false } tendermint-proto = { version = "=0.23.7", default-features = false } tendermint-rpc = { version = "=0.23.7", features = ["http-client", "websocket-client"] } @@ -29,7 +28,6 @@ ocall-handler = { path = "../../modules/ocall-handler" } enclave-api = { path = "../../modules/enclave-api" } ecall-commands = { path = "../../modules/ecall-commands" } attestation-report = { path = "../../modules/attestation-report" } -settings = { path = "../../modules/settings" } relay-tendermint = { path = "../../modules/relay/tendermint" } [features] diff --git a/tests/integration/src/lib.rs b/tests/integration/src/lib.rs index c5cee293..1147f098 100644 --- a/tests/integration/src/lib.rs +++ b/tests/integration/src/lib.rs @@ -8,8 +8,7 @@ mod tests { CommitmentProofPair, IASRemoteAttestationInput, InitClientInput, InitEnclaveInput, UpdateClientInput, VerifyMembershipInput, }; - use enclave_api::EnclaveCommandAPI; - use enclave_api::{Enclave, EnclavePrimitiveAPI}; + use enclave_api::{Enclave, EnclaveCommandAPI}; use host_environment::Environment; use ibc::core::{ ics23_commitment::{commitment::CommitmentProofBytes, merkle::MerkleProof}, @@ -25,11 +24,10 @@ mod tests { }; use lcp_types::Time; use log::*; - use once_cell::sync::Lazy; use relay_tendermint::Relayer; use std::str::FromStr; use std::sync::{Arc, RwLock}; - use store::{host::HostStore, memory::MemStore, transaction::CommitStore}; + use store::{host::HostStore, memory::MemStore}; use tempdir::TempDir; use tendermint_proto::Protobuf; use tokio::runtime::Runtime as TokioRuntime;