Merge pull request #103 from aeternity/release/0.8.0

Release/0.8.0

Author: johnsnewby

src/loader.rs

@@ -12,7 +12,6 @@ use middleware_result::*;
 use models::*;
 use node::*;
 use serde_json;
-use std::slice::SliceConcatExt;
 use std::sync::mpsc;
 use std::sync::mpsc::{Receiver, Sender};
 use std::thread;
@@ -142,13 +141,12 @@ impl BlockLoader {
                 serde_json::from_value(node.get_generation_at_height(current_height)?)?;
             if !gen_from_db.eq(&gen_from_server) {
                 debug!("Generations don't match at height {}", current_height);
-                in_fork = true;
                 fork_was_detected = true;
-                break;
+                in_fork = true;
             }
 
-            let mut differences = vec![];
-            if !in_fork {
+            if ! in_fork {
+                let mut differences;
                 for i in 0..gen_from_db.micro_blocks.len() {
                     differences = BlockLoader::compare_micro_blocks(
                         &node,
@@ -164,6 +162,7 @@ impl BlockLoader {
                     }
                 }
             }
+
             if !in_fork {
                 debug!("No fork found. Exiting loop");
                 break;

src/server.rs

@@ -1068,6 +1068,12 @@ fn status(_state: State<MiddlewareServer>) -> Response {
     response.finalize()
 }
 
+#[get("/api")]
+fn swagger() -> JsonValue {
+    let swagger_str = include_str!("../swagger/swagger.json");
+    serde_json::from_str(swagger_str).unwrap()
+}
+
 impl MiddlewareServer {
     pub fn start(self) {
         let allowed_origins = AllowedOrigins::all();
@@ -1098,6 +1104,7 @@ impl MiddlewareServer {
             .mount("/middleware", routes![reward_at_height])
             .mount("/middleware", routes![size])
             .mount("/middleware", routes![status])
+            .mount("/middleware", routes![swagger])
             .mount("/middleware", routes![transaction_rate])
             .mount("/middleware", routes![transactions_for_account])
             .mount("/middleware", routes![transactions_for_account_to_account])

src/websocket.rs

@@ -234,16 +234,6 @@ pub fn clients_for_object(candidate: &Candidate) -> Vec<Client> {
     }
 }
 
-fn match_objects(objects: Vec<String>, tx: String) -> bool {
-    let tx_objects = get_objects(tx);
-    for object in objects {
-        if tx_objects.contains(&object) {
-            return true;
-        }
-    }
-    false
-}
-
 pub fn get_objects(tx: String) -> HashSet<String> {
     lazy_static! {
         static ref OBJECT_REGEX: Regex = Regex::new(