test if order between hidapi and libusb matter

Author: niklasad1

hw/src/ledger.rs

@@ -108,14 +108,14 @@ pub struct Manager {
 
 impl Manager {
 	/// Create a new instance.
-	pub fn new(hidapi: Arc<Mutex<hidapi::HidApi>>, exiting: Arc<AtomicBool>) -> Result<Arc<Manager>, libusb::Error> {
+	pub fn new(hidapi: Arc<Mutex<hidapi::HidApi>>, exiting: Arc<AtomicBool>, usb_context: Arc<libusb::Context>)
+		-> Result<Arc<Manager>, libusb::Error> {
 		let manager = Arc::new(Manager {
 			usb: hidapi,
 			devices: RwLock::new(Vec::new()),
 			key_path: RwLock::new(KeyPath::Ethereum),
 		});
 
-		let usb_context = Arc::new(libusb::Context::new()?);
 		let m = manager.clone();
 
 		// Subscribe to all Ledger devices
@@ -444,8 +444,9 @@ impl libusb::Hotplug for EventHandler {
 #[test]
 fn smoke() {
 	use rustc_hex::FromHex;
+	let usb_context = Arc::new(libusb::Context::new().expect("libusb::Context"));
 	let hidapi = Arc::new(Mutex::new(hidapi::HidApi::new().expect("HidApi couldn't be instanced")));
-	let manager = Manager::new(hidapi.clone(), Arc::new(AtomicBool::new(false))).expect("Ledger::Manager");
+	let manager = Manager::new(hidapi.clone(), Arc::new(AtomicBool::new(false)), usb_context).expect("Ledger::Manager");
 
 	assert_eq!(try_connect_polling(manager.clone(), Duration::from_millis(500)), true);
 

hw/src/lib.rs

@@ -197,9 +197,11 @@ impl HardwareWalletManager {
 	/// Hardware wallet constructor
 	pub fn new() -> Result<HardwareWalletManager, Error> {
 		let exiting = Arc::new(AtomicBool::new(false));
+		let ledger_usb = Arc::new(libusb::Context::new()?);
+		let trezor_usb = Arc::new(libusb::Context::new()?);
 		let hidapi = Arc::new(Mutex::new(hidapi::HidApi::new().map_err(|e| Error::Hid(e.to_string().clone()))?));
-		let ledger = ledger::Manager::new(hidapi.clone(), exiting.clone())?;
-		let trezor = trezor::Manager::new(hidapi.clone(), exiting.clone())?;
+		let ledger = ledger::Manager::new(hidapi.clone(), exiting.clone(), ledger_usb)?;
+		let trezor = trezor::Manager::new(hidapi.clone(), exiting.clone(), trezor_usb)?;
 
 		Ok(HardwareWalletManager {
 			exiting: exiting,

hw/src/trezor.rs

@@ -105,15 +105,15 @@ enum HidVersion {
 
 impl Manager {
 	/// Create a new instance.
-	pub fn new(hidapi: Arc<Mutex<hidapi::HidApi>>, exiting: Arc<AtomicBool>) -> Result<Arc<Manager>, libusb::Error> {
+	pub fn new(hidapi: Arc<Mutex<hidapi::HidApi>>, exiting: Arc<AtomicBool>, usb_context: Arc<libusb::Context>)
+		-> Result<Arc<Manager>, libusb::Error> {
 		let manager = Arc::new(Manager {
 			usb: hidapi,
 			devices: RwLock::new(Vec::new()),
 			locked_devices: RwLock::new(Vec::new()),
 			key_path: RwLock::new(KeyPath::Ethereum),
 		});
 
-		let usb_context = Arc::new(libusb::Context::new()?);
 		let m = manager.clone();
 
 		// Subscribe to TREZOR V1
@@ -482,8 +482,9 @@ impl libusb::Hotplug for EventHandler {
 fn test_signature() {
 	use ethereum_types::{H160, H256, U256};
 
+	let usb = Arc::new(libusb::Context::new().expect("libusb::Context"));
 	let hidapi = Arc::new(Mutex::new(hidapi::HidApi::new().unwrap()));
-	let manager = Manager::new(hidapi.clone(), Arc::new(AtomicBool::new(false))).unwrap();
+	let manager = Manager::new(hidapi.clone(), Arc::new(AtomicBool::new(false)), usb).unwrap();
 	let addr: Address = H160::from("some_addr");
 
 	assert_eq!(try_connect_polling(manager.clone(), Duration::from_millis(500)), true);