remove 'extern crate'

MystenLabs · May 26, 2021 · 0fa880e · 0fa880e
1 parent d89041c
commit 0fa880e
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 37 deletions.
diff --git a/fastpay/src/bench.rs b/fastpay/src/bench.rs
@@ -3,10 +3,6 @@
 
 #![deny(warnings)]
 
-extern crate fastpay;
-extern crate fastpay_core;
-extern crate log;
-
 use fastpay::{network, transport};
 use fastpay_core::{authority::*, base_types::*, committee::*, messages::*, serialize::*};
 

diff --git a/fastpay/src/client.rs b/fastpay/src/client.rs
@@ -3,10 +3,6 @@
 
 #![deny(warnings)]
 
-extern crate env_logger;
-extern crate fastpay;
-extern crate fastpay_core;
-
 use fastpay::{config::*, network, transport};
 use fastpay_core::{
     authority::*, base_types::*, client::*, committee::Committee, messages::*, serialize::*,

diff --git a/fastpay/src/config.rs b/fastpay/src/config.rs
@@ -1,13 +1,11 @@
 // Copyright (c) Facebook Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::{
-    fastpay_core::{
-        base_types::*,
-        client::ClientState,
-        messages::{Address, CertifiedTransferOrder},
-    },
-    transport::NetworkProtocol,
+use crate::transport::NetworkProtocol;
+use fastpay_core::{
+    base_types::*,
+    client::ClientState,
+    messages::{Address, CertifiedTransferOrder},
 };
 
 use serde::{Deserialize, Serialize};

diff --git a/fastpay/src/lib.rs b/fastpay/src/lib.rs
@@ -3,10 +3,6 @@
 
 #![deny(warnings)]
 
-extern crate failure;
-extern crate fastpay_core;
-extern crate log;
-
 pub mod config;
 pub mod network;
 pub mod transport;
diff --git a/fastpay/src/server.rs b/fastpay/src/server.rs
@@ -3,10 +3,6 @@
 
 #![deny(warnings)]
 
-extern crate env_logger;
-extern crate fastpay;
-extern crate fastpay_core;
-
 use fastpay::{config::*, network, transport};
 use fastpay_core::{authority::*, base_types::*, committee::Committee};
 

diff --git a/fastpay_core/src/client.rs b/fastpay_core/src/client.rs
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{base_types::*, committee::Committee, downloader::*, error::FastPayError, messages::*};
-
+use failure::{bail, ensure};
 use futures::{future, StreamExt};
 use rand::seq::SliceRandom;
 use std::{

diff --git a/fastpay_core/src/error.rs b/fastpay_core/src/error.rs
@@ -1,11 +1,9 @@
 // Copyright (c) Facebook Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::{
-    base_types::*,
-    messages::*,
-    serde::{Deserialize, Serialize},
-};
+use crate::{base_types::*, messages::*};
+use failure::Fail;
+use serde::{Deserialize, Serialize};
 
 #[macro_export]
 macro_rules! fp_bail {

diff --git a/fastpay_core/src/fastpay_smart_contract.rs b/fastpay_core/src/fastpay_smart_contract.rs
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use super::{base_types::*, committee::Committee, messages::*};
+use failure::ensure;
 use std::collections::BTreeMap;
 
 #[cfg(test)]

diff --git a/fastpay_core/src/lib.rs b/fastpay_core/src/lib.rs
@@ -3,14 +3,6 @@
 
 #![deny(warnings)]
 
-#[macro_use]
-extern crate failure;
-extern crate base64;
-extern crate bincode;
-extern crate ed25519_dalek;
-extern crate futures;
-extern crate serde;
-
 #[macro_use]
 pub mod error;
 

diff --git a/fastpay_core/src/serialize.rs b/fastpay_core/src/serialize.rs
@@ -4,6 +4,7 @@
 use super::messages::*;
 use crate::error::*;
 
+use failure::format_err;
 use serde::{Deserialize, Serialize};
 
 #[cfg(test)]