Merge remote-tracking branch 'origin/master' into rpc-middleware

2016-12-01 19:43:31 -08:00
parent df3c07b0a9 21a76c22fc
commit 1dd13372b6
222 changed files with 3180 additions and 1695 deletions
--- a/signer/src/ws_server/session.rs
+++ b/signer/src/ws_server/session.rs
@@ -99,7 +99,7 @@ fn auth_is_valid(codes_path: &Path, protocols: ws::Result<Vec<&str>>) -> bool {

 							let res = codes.is_valid(&auth, time);
 							// make sure to save back authcodes - it might have been modified
-							if let Err(_) = codes.to_file(codes_path) {
+							if codes.to_file(codes_path).is_err() {
 								warn!(target: "signer", "Couldn't save authorization codes to file.");
 							}
 							res