grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Replace deprecated tempdir dependency with tempfile (#11588)

Browse Source 
`Tempdir` is deprecated, but the functionality has been merged into
another crate: `tempfile`. This commit removes all `tempdir` dependencies
and replaces them with `tempfile` and the equivalent bindings.

Fixes #11560
This commit is contained in:
marktoda
2020-03-29 13:31:17 -07:00
committed by GitHub
parent 4f26ffd447
commit 2a3217d8d8
76 changed files with 220 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rpc/src/authcodes.rs
View File

@@ -215,7 +215,7 @@ mod tests {
use std::io::{Read, Write};
use std::{time, fs};
use std::cell::Cell;
use tempdir::TempDir;
use tempfile::TempDir;
use hash::keccak;
use ethereum_types::H256;
@@ -289,7 +289,7 @@ mod tests {
#[test]
fn should_read_old_format_from_file() {
// given
let tempdir = TempDir::new("").unwrap();
let tempdir = TempDir::new().unwrap();
let file_path = tempdir.path().join("file");
let code = "23521352asdfasdfadf";
{
@@ -308,7 +308,7 @@ mod tests {
#[test]
fn should_remove_old_unused_tokens() {
// given
let tempdir = TempDir::new("").unwrap();
let tempdir = TempDir::new().unwrap();
let file_path = tempdir.path().join("file");
let code1 = "11111111asdfasdf111";
let code2 = "22222222asdfasdf222";

2
rpc/src/lib.rs
View File

@@ -86,7 +86,7 @@ extern crate account_state;
extern crate stats;
extern crate snapshot;
extern crate tempdir;
extern crate tempfile;
extern crate trace;
extern crate vm;

4
rpc/src/tests/helpers.rs
View File

@@ -16,7 +16,7 @@
use std::ops::{Deref, DerefMut};
use std::path::PathBuf;
use tempdir::TempDir;
use tempfile::TempDir;
use parity_runtime::{Runtime, TaskExecutor};
@@ -62,7 +62,7 @@ pub struct GuardedAuthCodes {
impl Default for GuardedAuthCodes {
fn default() -> Self {
let tempdir = TempDir::new("").unwrap();
let tempdir = TempDir::new().unwrap();
let path = tempdir.path().join("file");
GuardedAuthCodes {

20
rpc/src/v1/tests/mocked/parity_accounts.rs
View File

@@ -21,7 +21,7 @@ use accounts::{AccountProvider, AccountProviderSettings};
use ethereum_types::Address;
use ethstore::EthStore;
use ethstore::accounts_dir::RootDiskDirectory;
use tempdir::TempDir;
use tempfile::TempDir;
use jsonrpc_core::IoHandler;
use v1::{ParityAccounts, ParityAccountsInfo, ParityAccountsClient};
@@ -219,7 +219,7 @@ fn should_be_able_to_remove_address() {
#[test]
fn rpc_parity_new_vault() {
let tempdir = TempDir::new("").unwrap();
let tempdir = TempDir::new().unwrap();
let tester = setup_with_vaults_support(tempdir.path().to_str().unwrap());
let request = r#"{"jsonrpc": "2.0", "method": "parity_newVault", "params":["vault1", "password1"], "id": 1}"#;
@@ -232,7 +232,7 @@ fn rpc_parity_new_vault() {
#[test]
fn rpc_parity_open_vault() {
let tempdir = TempDir::new("").unwrap();
let tempdir = TempDir::new().unwrap();
let tester = setup_with_vaults_support(tempdir.path().to_str().unwrap());
assert!(tester.accounts.create_vault("vault1", &"password1".into()).is_ok());
@@ -246,7 +246,7 @@ fn rpc_parity_open_vault() {
#[test]
fn rpc_parity_close_vault() {
let tempdir = TempDir::new("").unwrap();
let tempdir = TempDir::new().unwrap();
let tester = setup_with_vaults_support(tempdir.path().to_str().unwrap());
assert!(tester.accounts.create_vault("vault1", &"password1".into()).is_ok());
@@ -259,7 +259,7 @@ fn rpc_parity_close_vault() {
#[test]
fn rpc_parity_change_vault_password() {
let tempdir = TempDir::new("").unwrap();
let tempdir = TempDir::new().unwrap();
let tester = setup_with_vaults_support(tempdir.path().to_str().unwrap());
assert!(tester.accounts.create_vault("vault1", &"password1".into()).is_ok());
@@ -272,7 +272,7 @@ fn rpc_parity_change_vault_password() {
#[test]
fn rpc_parity_change_vault() {
let tempdir = TempDir::new("").unwrap();
let tempdir = TempDir::new().unwrap();
let tester = setup_with_vaults_support(tempdir.path().to_str().unwrap());
let (address, _) = tester.accounts.new_account_and_public(&"root_password".into()).unwrap();
@@ -286,7 +286,7 @@ fn rpc_parity_change_vault() {
#[test]
fn rpc_parity_vault_adds_vault_field_to_acount_meta() {
let tempdir = TempDir::new("").unwrap();
let tempdir = TempDir::new().unwrap();
let tester = setup_with_vaults_support(tempdir.path().to_str().unwrap());
let (address1, _) = tester.accounts.new_account_and_public(&"root_password1".into()).unwrap();
@@ -310,7 +310,7 @@ fn rpc_parity_vault_adds_vault_field_to_acount_meta() {
#[test]
fn rpc_parity_list_vaults() {
let tempdir = TempDir::new("").unwrap();
let tempdir = TempDir::new().unwrap();
let tester = setup_with_vaults_support(tempdir.path().to_str().unwrap());
assert!(tester.accounts.create_vault("vault1", &"password1".into()).is_ok());
@@ -327,7 +327,7 @@ fn rpc_parity_list_vaults() {
#[test]
fn rpc_parity_list_opened_vaults() {
let tempdir = TempDir::new("").unwrap();
let tempdir = TempDir::new().unwrap();
let tester = setup_with_vaults_support(tempdir.path().to_str().unwrap());
assert!(tester.accounts.create_vault("vault1", &"password1".into()).is_ok());
@@ -346,7 +346,7 @@ fn rpc_parity_list_opened_vaults() {
#[test]
fn rpc_parity_get_set_vault_meta() {
let tempdir = TempDir::new("").unwrap();
let tempdir = TempDir::new().unwrap();
let tester = setup_with_vaults_support(tempdir.path().to_str().unwrap());
assert!(tester.accounts.create_vault("vault1", &"password1".into()).is_ok());