2d2513b35a
* network-devp2p: bump rand `0.7` * updater: bump rand `0.7` * hash-fetch: bump rand `0.7` * ethcore-sync: bump rand `0.7` * rpc: dont work yet * [private-tx] remove unused rand * [ethcore-snapshot] bump rand 0.7 * [engine clique]: bump rand 0.7 * [engine authority-round]: remove rand * [ethcore-blockchain]: bump rand 0.7 * [ethcore]: bump rand 0.7 * [ethcore-light]: bump rand 0.7 * [ethstore]: bump rand 0.7 * Fix for rand usage in rpc * [rpc]: fix test build * [ethcore-sync]: fix test build * [snapshot tests]: rand 0.7 * [ethkey]: bump rand 0.7 * [rpc]: resolve TODO incompatible `rand versions` * [ethkey] use `rust-secp256k1` master branch * fix(bad merge): ethcoore-light remove itertools * [rpc tests]: revert rpc test changes in #11139 `#11139` makes use a different `RNG/seed`, not `H64::random_using(&mut self.rand)` This commit reverts the changed tests (the generated id by `Subscribers::next_id`) * [ethkey/random]: resolve introduced `TODO`
82 lines
2.1 KiB
Rust
82 lines
2.1 KiB
Rust
// Copyright 2015-2019 Parity Technologies (UK) Ltd.
|
|
// This file is part of Parity Ethereum.
|
|
|
|
// Parity Ethereum is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
|
|
// Parity Ethereum is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with Parity Ethereum. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
use std::path::PathBuf;
|
|
use std::{env, fs};
|
|
use rand::{RngCore, rngs::OsRng};
|
|
use ethstore::accounts_dir::{KeyDirectory, RootDiskDirectory};
|
|
use ethstore::{Error, SafeAccount};
|
|
|
|
pub fn random_dir() -> PathBuf {
|
|
let mut rng = OsRng;
|
|
let mut dir = env::temp_dir();
|
|
dir.push(format!("{:x}-{:x}", rng.next_u64(), rng.next_u64()));
|
|
dir
|
|
}
|
|
|
|
pub struct TransientDir {
|
|
dir: RootDiskDirectory,
|
|
path: PathBuf,
|
|
}
|
|
|
|
impl TransientDir {
|
|
pub fn create() -> Result<Self, Error> {
|
|
let path = random_dir();
|
|
let result = TransientDir {
|
|
dir: RootDiskDirectory::create(&path)?,
|
|
path: path,
|
|
};
|
|
|
|
Ok(result)
|
|
}
|
|
|
|
pub fn open() -> Self {
|
|
let path = random_dir();
|
|
TransientDir {
|
|
dir: RootDiskDirectory::at(&path),
|
|
path: path,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl Drop for TransientDir {
|
|
fn drop(&mut self) {
|
|
fs::remove_dir_all(&self.path).expect("Expected to remove temp dir");
|
|
}
|
|
}
|
|
|
|
impl KeyDirectory for TransientDir {
|
|
fn load(&self) -> Result<Vec<SafeAccount>, Error> {
|
|
self.dir.load()
|
|
}
|
|
|
|
fn update(&self, account: SafeAccount) -> Result<SafeAccount, Error> {
|
|
self.dir.update(account)
|
|
}
|
|
|
|
fn insert(&self, account: SafeAccount) -> Result<SafeAccount, Error> {
|
|
self.dir.insert(account)
|
|
}
|
|
|
|
fn remove(&self, account: &SafeAccount) -> Result<(), Error> {
|
|
self.dir.remove(account)
|
|
}
|
|
|
|
fn unique_repr(&self) -> Result<u64, Error> {
|
|
self.dir.unique_repr()
|
|
}
|
|
}
|