add common crate

Signed-off-by: xermicus <cyrill@parity.io>

crates/solidity/src/solc/combined_json/contract.rs

@@ -67,7 +67,7 @@ impl Contract {
             .find_map(|(contract_entry, hash)| {
                 if contract_entry.starts_with(entry) {
                     Some(
-                        u32::from_str_radix(hash.as_str(), era_compiler_common::BASE_HEXADECIMAL)
+                        u32::from_str_radix(hash.as_str(), revive_common::BASE_HEXADECIMAL)
                             .expect("Test hash is always valid"),
                     )
                 } else {

crates/solidity/src/solc/combined_json/mod.rs

@@ -89,7 +89,7 @@ impl CombinedJson {
         overwrite: bool,
     ) -> anyhow::Result<()> {
         let mut file_path = output_directory.to_owned();
-        file_path.push(format!("combined.{}", era_compiler_common::EXTENSION_JSON));
+        file_path.push(format!("combined.{}", revive_common::EXTENSION_JSON));
 
         if file_path.exists() && !overwrite {
             eprintln!(

crates/solidity/src/solc/mod.rs

@@ -122,21 +122,21 @@ impl Compiler {
             );
         }
 
-        let mut output: StandardJsonOutput = era_compiler_common::deserialize_from_slice(
-            output.stdout.as_slice(),
-        )
-        .map_err(|error| {
-            anyhow::anyhow!(
-                "{} subprocess output parsing error: {}\n{}",
-                self.executable,
-                error,
-                era_compiler_common::deserialize_from_slice::<serde_json::Value>(
-                    output.stdout.as_slice()
+        let mut output: StandardJsonOutput =
+            revive_common::deserialize_from_slice(output.stdout.as_slice()).map_err(|error| {
+                anyhow::anyhow!(
+                    "{} subprocess output parsing error: {}\n{}",
+                    self.executable,
+                    error,
+                    revive_common::deserialize_from_slice::<serde_json::Value>(
+                        output.stdout.as_slice()
+                    )
+                    .map(|json| serde_json::to_string_pretty(&json).expect("Always valid"))
+                    .unwrap_or_else(
+                        |_| String::from_utf8_lossy(output.stdout.as_slice()).to_string()
+                    ),
                 )
-                .map(|json| serde_json::to_string_pretty(&json).expect("Always valid"))
-                .unwrap_or_else(|_| String::from_utf8_lossy(output.stdout.as_slice()).to_string()),
-            )
-        })?;
+            })?;
         output.preprocess_ast(&version, pipeline, suppressed_warnings.as_slice())?;
         output.remove_evm();
 
@@ -183,21 +183,21 @@ impl Compiler {
             );
         }
 
-        let mut combined_json: CombinedJson = era_compiler_common::deserialize_from_slice(
-            output.stdout.as_slice(),
-        )
-        .map_err(|error| {
-            anyhow::anyhow!(
-                "{} subprocess output parsing error: {}\n{}",
-                self.executable,
-                error,
-                era_compiler_common::deserialize_from_slice::<serde_json::Value>(
-                    output.stdout.as_slice()
+        let mut combined_json: CombinedJson =
+            revive_common::deserialize_from_slice(output.stdout.as_slice()).map_err(|error| {
+                anyhow::anyhow!(
+                    "{} subprocess output parsing error: {}\n{}",
+                    self.executable,
+                    error,
+                    revive_common::deserialize_from_slice::<serde_json::Value>(
+                        output.stdout.as_slice()
+                    )
+                    .map(|json| serde_json::to_string_pretty(&json).expect("Always valid"))
+                    .unwrap_or_else(
+                        |_| String::from_utf8_lossy(output.stdout.as_slice()).to_string()
+                    ),
                 )
-                .map(|json| serde_json::to_string_pretty(&json).expect("Always valid"))
-                .unwrap_or_else(|_| String::from_utf8_lossy(output.stdout.as_slice()).to_string()),
-            )
-        })?;
+            })?;
         for filtered_flag in filtered_flags.into_iter() {
             for (_path, contract) in combined_json.contracts.iter_mut() {
                 match filtered_flag {

crates/solidity/src/solc/standard_json/input/mod.rs

@@ -62,7 +62,7 @@ impl Input {
     #[allow(clippy::too_many_arguments)]
     pub fn try_from_paths(
         language: Language,
-        evm_version: Option<era_compiler_common::EVMVersion>,
+        evm_version: Option<revive_common::EVMVersion>,
         paths: &[PathBuf],
         library_map: Vec<String>,
         remappings: Option<BTreeSet<String>>,
@@ -107,7 +107,7 @@ impl Input {
     ///
     #[allow(clippy::too_many_arguments)]
     pub fn try_from_sources(
-        evm_version: Option<era_compiler_common::EVMVersion>,
+        evm_version: Option<revive_common::EVMVersion>,
         sources: BTreeMap<String, String>,
         libraries: BTreeMap<String, BTreeMap<String, String>>,
         remappings: Option<BTreeSet<String>>,

crates/solidity/src/solc/standard_json/input/settings/mod.rs

@@ -24,7 +24,7 @@ use self::selection::Selection;
 pub struct Settings {
     /// The target EVM version.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub evm_version: Option<era_compiler_common::EVMVersion>,
+    pub evm_version: Option<revive_common::EVMVersion>,
     /// The linker library addresses.
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub libraries: Option<BTreeMap<String, BTreeMap<String, String>>>,
@@ -53,7 +53,7 @@ impl Settings {
     /// A shortcut constructor.
     ///
     pub fn new(
-        evm_version: Option<era_compiler_common::EVMVersion>,
+        evm_version: Option<revive_common::EVMVersion>,
         libraries: BTreeMap<String, BTreeMap<String, String>>,
         remappings: Option<BTreeSet<String>>,
         output_selection: Selection,