reorganize tests and add quassel features

1 files changed, 16 insertions, 10 deletions

diff --git a/Cargo.toml b/Cargo.toml
index 5087e2c..94366cf 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,24 +15,24 @@ autobins = true
 log = "0.4"
 byteorder = "1.3.2"
 failure = "0.1"
-either = "1.5"
 time = "0.2"
-async-trait = "0.1"
 
-default-macro = { path = "../default-macro" }
+num-traits = "0.2"
+num-derive = "0.3"
 
-bytes = { version = "1.0" }
+libquassel-derive = { path = "./derive" }
+
+
+bytes = { version = "1.0", optional = true }
 flate2 = { version = "1.0", features = ["tokio"], optional = true }
 tokio = { version = "1.0", features = [], optional = true }
 tokio-util = { version = "0.6", features = ["codec"], optional = true }
-futures-util = { version = "0.3", features = ["std"], optional = true }
-futures = { version = "0.3", optional = true }
 
 [features]
-framing = ["tokio", "tokio-util", "flate2"]
+framing = ["tokio", "tokio-util", "flate2", "bytes"]
 
 # Enable all the quassel features
-all-quassel-features = ["long-message-id", "long-time", "rich-messages", "sender-prefixes"]
+all-quassel-features = ["long-message-id", "long-time", "rich-messages", "sender-prefixes", "authenticators"]
 
 # Serialize message IDs as i64
 long-message-id = []
@@ -42,6 +42,8 @@ long-time = []
 rich-messages = []
 # Show prefixes for senders in backlog
 sender-prefixes = []
+# Support for exchangeable auth backends
+authenticators = []
 
 
 default = []
@@ -53,8 +55,12 @@ all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
 
 [dev-dependencies]
-# futures = { version = "0.3" }
+futures = { version = "0.3" }
 # flate2 = { version = "1.0", features = ["tokio"] }
 # tokio = { version = "0.3", features = ["full"] }
 # tokio-util = { version = "0.5", features = ["codec"] }
-# tokio-test = { version = "0.3" }
+tokio-test = { version = "0.4" }
+pretty_assertions = "0.6"
+
+[workspace]
+members = ["derive", "examples/quasselproxy"]