Makes modifications in accordance with R2Pipe API changes

Cargo.toml

@@ -30,8 +30,9 @@ clippy = {version = "0.0.61", optional = true}
 
 [dependencies.r2pipe]
 git = "https://github.com/radare/r2pipe.rs"
-#path = "../r2pipe.rs"
+
+[dependencies.r2api]
+git = "https://github.com/radare/radare2-r2pipe-api"
 
 [dependencies.esil]
 git = "https://github.com/radare/esil-rs"
-#path = "../esil-rs"

minidec/main.rs

@@ -1,5 +1,6 @@
 extern crate radeco_lib;
 extern crate r2pipe;
+extern crate r2api;
 extern crate env_logger;
 
 mod cli;
@@ -10,6 +11,7 @@ use std::io::Write;
 use std::path::{Path, PathBuf};
 
 use r2pipe::r2::R2;
+use r2api::api_trait::R2Api;
 use radeco_lib::analysis::cse::CSE;
 use radeco_lib::analysis::sccp;
 use radeco_lib::analysis::valueset::analyzer_wysinwyx::FnAnalyzer;

src/analysis/valueset/analyzer_wysinwyx.rs

@@ -28,7 +28,7 @@ use middle::ssa::ssastorage::{NodeData,SSAStorage};
 use middle::ir::{MOpcode,MAddress,MArity};
 use middle::ir_writer::{IRWriter};
 
-use r2pipe::structs::{LRegInfo};
+use r2api::structs::{LRegInfo};
 
 //use esil::parser::{Parse, Parser};
 //use esil::lexer::{Token, Tokenizer};

src/backend/lang_c/c_ast_constructor.rs

@@ -85,6 +85,7 @@ mod test {
     use analysis::interproc::interproc::analyze_module;
     use analysis::interproc::summary;
     use r2pipe::r2::R2;
+    use r2api::api_trait::R2Api;
 
     #[test]
     #[ignore]

src/frontend/containers.rs

@@ -3,7 +3,7 @@
 use std::collections::{BTreeSet, HashMap};
 use std::{thread, fmt, sync, hash};
 
-use r2pipe::structs::{FunctionInfo, LOpInfo, LRegInfo, LVarInfo};
+use r2api::structs::{FunctionInfo, LOpInfo, LRegInfo, LVarInfo};
 
 use petgraph::graph::NodeIndex;
 

src/frontend/source.rs

@@ -6,16 +6,16 @@ use std::io::{Read, Write};
 
 use serde_json;
 
-use r2pipe::structs::{FunctionInfo, LFlagInfo, LOpInfo, LRegInfo, LSectionInfo, LStringInfo};
+use r2api::api_trait::R2Api;
 use r2pipe::r2::R2;
+use r2api::structs::{FunctionInfo, LFlagInfo, LOpInfo, LRegInfo, LSectionInfo, LStringInfo};
 
 pub trait Source {
     fn functions(&mut self) -> Vec<FunctionInfo>;
     fn instructions_at(&mut self, u64) -> Vec<LOpInfo>;
     fn register_profile(&mut self) -> LRegInfo;
     fn flags(&mut self) -> Vec<LFlagInfo>;
     fn section_map(&mut self) -> Vec<LSectionInfo>;
-    fn strings(&mut self) -> Vec<LStringInfo>;
 
     fn send(&mut self, _: &str) { }
 
@@ -71,7 +71,7 @@ pub trait Source {
 }
 
 // Implementation of `Source` trait for R2.
-impl Source for R2 {
+impl Source for R2 where R2: R2Api {
     fn functions(&mut self) -> Vec<FunctionInfo> {
         let fns = self.fn_list();
         fns.expect("Failed to load funtion info from r2")
@@ -97,10 +97,6 @@ impl Source for R2 {
         self.sections().expect("Failed to get section info from r2")
     }
 
-    fn strings(&mut self) -> Vec<LStringInfo> {
-        self.strings(false).expect("Failed to load strings from r2")
-    }
-
     fn send(&mut self, s: &str) {
         self.send(s);
     }
@@ -159,6 +155,10 @@ impl FileSource {
             base_name: base_name.to_owned(),
         }
     }
+
+    pub fn strings(&mut self) -> Vec<LStringInfo> {
+        serde_json::from_str(&self.read_file(suffix::STRING)).expect("Failed to decode json")
+    }
 }
 
 impl Source for FileSource {
@@ -182,10 +182,6 @@ impl Source for FileSource {
     fn section_map(&mut self) -> Vec<LSectionInfo> {
         serde_json::from_str(&self.read_file(suffix::SECTION)).expect("Failed to decode json")
     }
-
-    fn strings(&mut self) -> Vec<LStringInfo> {
-        serde_json::from_str(&self.read_file(suffix::STRING)).expect("Failed to decode json")
-    }
 }
 
 impl From<R2> for FileSource {

src/frontend/ssaconstructor.rs

@@ -16,7 +16,7 @@ use std::collections::HashMap;
 use petgraph::graph::NodeIndex;
 use std::{fmt, cmp};
 
-use r2pipe::structs::{LOpInfo, LRegInfo};
+use r2api::structs::{LOpInfo, LRegInfo};
 
 use esil::parser::{Parse, Parser};
 use esil::lexer::{Token, Tokenizer};
@@ -505,7 +505,7 @@ mod test {
     use std::fs::File;
     use std::io::prelude::*;
     use serde_json;
-    use r2pipe::structs::{LFunctionInfo, LRegInfo};
+    use r2api::structs::{LFunctionInfo, LRegInfo};
     use middle::ssa::ssastorage::SSAStorage;
     use middle::ir_writer::IRWriter;
     use middle::{dot, dce};

src/lib.rs

@@ -53,6 +53,7 @@ extern crate num;
 #[macro_use] extern crate lazy_static;
 #[macro_use] extern crate log;
 extern crate r2pipe;
+extern crate r2api;
 
 extern crate esil;
 

src/middle/regfile.rs

@@ -12,7 +12,7 @@ use std::cmp::Ordering;
 use std::collections::HashMap;
 use std::convert::From;
 
-use r2pipe::structs::LRegInfo;
+use r2api::structs::LRegInfo;
 
 use middle::ssa::ssa_traits::ValueType;
 

tests/bin_ls_test.rs

@@ -7,7 +7,7 @@ extern crate serde_json;
 use std::fs::File;
 use std::io::prelude::*;
 
-use r2pipe::structs::{LFunctionInfo, LRegInfo};
+use r2api::structs::{LFunctionInfo, LRegInfo};
 
 use radeco_lib::frontend::ssaconstructor::SSAConstruct;
 use radeco_lib::middle::ssa::ssastorage::SSAStorage;

tests/complete_test1.rs

@@ -60,7 +60,7 @@ extern crate serde_json;
 use std::fs::File;
 use std::io::prelude::*;
 
-use r2pipe::structs::{LFunctionInfo, LRegInfo};
+use r2api::structs::{LFunctionInfo, LRegInfo};
 
 use radeco_lib::frontend::ssaconstructor::SSAConstruct;
 use radeco_lib::middle::ssa::ssastorage::SSAStorage;