Integrate gitlab ci (#503)

fevo1971 · tomusdrw · commit 1f1107521436 · 2019-10-16T11:52:43.000+02:00
* added giltab-ci

* removed '--lock' from test

* no time command in onw windows

* added stage: checkstyle

* shortend the config a bit

* bit more compact ci-file

* gitlab-ci intergation

* changed order of ci jobs

* Re-format.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -0,0 +1,52 @@
+stages:
+  - checkstyle
+  - test
+
+.test_and_build:                 &test_and_build
+  script:
+    - cargo build --all
+    - cargo test --all
+
+.only:                             &only
+  only:
+    - triggers
+    - tags
+    - master
+    - schedules
+    - web
+    - /^[0-9]+$/
+
+# test rust stable
+test-linux-stable:
+  image:                           parity/rust-builder:latest
+  stage:                           test
+  <<:                             *test_and_build
+  <<:                             *only
+  tags:
+    - linux-docker
+
+test-windows-stable:
+  stage:                           test
+  <<:                             *test_and_build
+  <<:                             *only
+  tags:
+    - rust-windows
+
+test-mac-stable:
+  stage:                           test
+  <<:                             *test_and_build
+  <<:                             *only
+  tags:
+    - rust-mac
+
+# check style 
+checkstyle-linux-stable:
+  image:                           parity/rust-builder:latest
+  stage:                           checkstyle
+  script:
+    - rustup component add rustfmt
+    - cargo fmt --all -- --check
+  allow_failure: true
+  <<:                             *only
+  tags:
+    - linux-docker
diff --git a/core-client/transports/src/lib.rs b/core-client/transports/src/lib.rs
@@ -509,5 +509,4 @@ mod tests {
 			"Expected at least one received item."
 		);
 	}
-
 }
diff --git a/core/src/io.rs b/core/src/io.rs
@@ -1,4 +1,7 @@
-use std::collections::{hash_map::{Iter, IntoIter}, HashMap};
+use std::collections::{
+	hash_map::{IntoIter, Iter},
+	HashMap,
+};
 use std::ops::{Deref, DerefMut};
 use std::sync::Arc;
 
diff --git a/core/src/lib.rs b/core/src/lib.rs
@@ -28,10 +28,10 @@ extern crate serde_derive;
 
 pub use futures;
 
-#[doc(hidden)]
-pub extern crate serde_json;
 #[doc(hidden)]
 pub extern crate serde;
+#[doc(hidden)]
+pub extern crate serde_json;
 
 mod calls;
 mod io;
diff --git a/core/src/types/response.rs b/core/src/types/response.rs
@@ -286,8 +286,11 @@ fn should_parse_empty_response_as_batch() {
 
 	let dsr = r#""#;
 
-	let deserialized1: Result<Response, _>= serde_json::from_str(dsr);
+	let deserialized1: Result<Response, _> = serde_json::from_str(dsr);
 	let deserialized2: Result<Response, _> = Response::from_json(dsr);
-	assert!(deserialized1.is_err(), "Empty string is not valid JSON, so we should get an error.");
+	assert!(
+		deserialized1.is_err(),
+		"Empty string is not valid JSON, so we should get an error."
+	);
 	assert_eq!(deserialized2.unwrap(), Response::Batch(vec![]));
 }
diff --git a/http/src/lib.rs b/http/src/lib.rs
@@ -530,42 +530,43 @@ fn serve<M: jsonrpc::Metadata, S: jsonrpc::Middleware<M>>(
 			}
 		};
 
-		bind_result.and_then(move |(listener, local_addr)| {
-			let allowed_hosts = server_utils::hosts::update(allowed_hosts, &local_addr);
-
-			let mut http = server::conn::Http::new();
-			http.keep_alive(keep_alive);
-			let tcp_stream = SuspendableStream::new(listener.incoming());
-
-			tcp_stream
-				.map(move |socket| {
-					let service = ServerHandler::new(
-						jsonrpc_handler.clone(),
-						cors_domains.clone(),
-						cors_max_age,
-						allowed_headers.clone(),
-						allowed_hosts.clone(),
-						request_middleware.clone(),
-						rest_api,
-						health_api.clone(),
-						max_request_body_size,
-						keep_alive,
-					);
-
-					http.serve_connection(socket, service)
-						.map_err(|e| error!("Error serving connection: {:?}", e))
-				})
-				.buffer_unordered(1024)
-				.for_each(|_| Ok(()))
-				.map_err(|e| {
-					warn!("Incoming streams error, closing sever: {:?}", e);
-				})
-				.select(shutdown_signal.map_err(|e| {
-					debug!("Shutdown signaller dropped, closing server: {:?}", e);
-				}))
-				.map_err(|_| ())
-		})
-		.and_then(|_| done_tx.send(()))
+		bind_result
+			.and_then(move |(listener, local_addr)| {
+				let allowed_hosts = server_utils::hosts::update(allowed_hosts, &local_addr);
+
+				let mut http = server::conn::Http::new();
+				http.keep_alive(keep_alive);
+				let tcp_stream = SuspendableStream::new(listener.incoming());
+
+				tcp_stream
+					.map(move |socket| {
+						let service = ServerHandler::new(
+							jsonrpc_handler.clone(),
+							cors_domains.clone(),
+							cors_max_age,
+							allowed_headers.clone(),
+							allowed_hosts.clone(),
+							request_middleware.clone(),
+							rest_api,
+							health_api.clone(),
+							max_request_body_size,
+							keep_alive,
+						);
+
+						http.serve_connection(socket, service)
+							.map_err(|e| error!("Error serving connection: {:?}", e))
+					})
+					.buffer_unordered(1024)
+					.for_each(|_| Ok(()))
+					.map_err(|e| {
+						warn!("Incoming streams error, closing sever: {:?}", e);
+					})
+					.select(shutdown_signal.map_err(|e| {
+						debug!("Shutdown signaller dropped, closing server: {:?}", e);
+					}))
+					.map_err(|_| ())
+			})
+			.and_then(|_| done_tx.send(()))
 	});
 }
 
diff --git a/pubsub/src/handler.rs b/pubsub/src/handler.rs
@@ -146,5 +146,4 @@ mod tests {
 		assert_eq!(res, Some(response.into()));
 		assert_eq!(called.load(Ordering::SeqCst), true);
 	}
-
 }
diff --git a/server-utils/src/cors.rs b/server-utils/src/cors.rs
@@ -590,5 +590,4 @@ mod tests {
 		// then
 		assert_eq!(res, AllowCors::NotRequired);
 	}
-
 }
diff --git a/server-utils/src/reactor.rs b/server-utils/src/reactor.rs
@@ -130,10 +130,7 @@ impl RpcEventLoop {
 
 	/// Blocks current thread and waits until the event loop is finished.
 	pub fn wait(mut self) -> Result<(), ()> {
-		self.handle
-			.take()
-			.ok_or(())?
-			.wait()
+		self.handle.take().ok_or(())?.wait()
 	}
 
 	/// Finishes this event loop.
diff --git a/tcp/src/server.rs b/tcp/src/server.rs
@@ -164,7 +164,7 @@ impl<M: Metadata, S: Middleware<M> + 'static> ServerBuilder<M, S> {
 							.map(|_| ())
 							.map_err(|(e, _)| {
 								error!("Error while executing the server: {:?}", e);
-							})
+							}),
 					)
 				}
 				Err(e) => {

Original file line number	Diff line number	Diff line change
`@@ -509,5 +509,4 @@ mod tests {`
`509`	`509`	`"Expected at least one received item."`
`510`	`510`	`);`
`511`	`511`	`}`
`512`		`-`
`513`	`512`	`}`
Original file line number	Diff line number	Diff line change
`@@ -146,5 +146,4 @@ mod tests {`
`146`	`146`	`assert_eq!(res, Some(response.into()));`
`147`	`147`	`assert_eq!(called.load(Ordering::SeqCst), true);`
`148`	`148`	`}`
`149`		`-`
`150`	`149`	`}`
Original file line number	Diff line number	Diff line change
`@@ -590,5 +590,4 @@ mod tests {`
`590`	`590`	`// then`
`591`	`591`	`assert_eq!(res, AllowCors::NotRequired);`
`592`	`592`	`}`
`593`		`-`
`594`	`593`	`}`
Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ impl<M: Metadata, S: Middleware<M> + 'static> ServerBuilder<M, S> {`
`164`	`164`	`.map(\|_\| ())`
`165`	`165`	`.map_err(\|(e, _)\| {`
`166`	`166`	`error!("Error while executing the server: {:?}", e);`
`167`		`- })`
	`167`	`+ }),`
`168`	`168`	`)`
`169`	`169`	`}`
`170`	`170`	`Err(e) => {`