revert devcontainer

sephynox · Jan 8, 2024 · f7d7efe · f7d7efe
1 parent 5044de8
commit f7d7efe
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 52 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
diff --git a/.gitignore b/.gitignore
@@ -18,5 +18,3 @@ Cargo.lock
 
 # Additional
 src/main.rs
-
-.DS_Store
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,7 +20,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - make `new` methods of models public
 - add `AsyncWebsocketClient`
 - update dependencies
-- add devcontainer
 
 ## [[v0.2.0-beta]]
 ### Added

diff --git a/Cargo.toml b/Cargo.toml
@@ -93,7 +93,6 @@ default = [
     "core",
     "models",
     "utils",
-    "net",
     "tungstenite",
     "embedded-websocket",
 ]
@@ -103,9 +102,13 @@ requests = ["core", "amounts", "currencies"]
 ledger = ["core", "amounts", "currencies"]
 amounts = ["core"]
 currencies = ["core"]
-net = ["dep:url", "dep:futures"]
-tungstenite = ["tokio/full", "tokio-tungstenite/native-tls"]
-embedded-websocket = ["dep:embedded-websocket"]
+tungstenite = [
+    "dep:url",
+    "dep:futures",
+    "tokio/full",
+    "tokio-tungstenite/native-tls",
+]
+embedded-websocket = ["dep:url", "dep:futures", "dep:embedded-websocket"]
 core = ["utils"]
 utils = []
 std = [

diff --git a/src/.DS_Store b/src/.DS_Store
diff --git a/src/asynch/mod.rs b/src/asynch/mod.rs
@@ -1,2 +1,2 @@
-#[cfg(feature = "net")]
+#[cfg(any(feature = "tungstenite", feature = "embedded-websocket"))]
 pub mod clients;
diff --git a/src/models/.DS_Store b/src/models/.DS_Store
diff --git a/tests/common/mod.rs b/tests/common/mod.rs
@@ -9,6 +9,7 @@ use tokio::net::TcpStream;
 use tokio_util::codec::Framed;
 #[cfg(feature = "tungstenite")]
 use xrpl::asynch::clients::async_websocket_client::AsyncWebsocketClientTungstenite;
+#[cfg(any(feature = "tungstenite", feature = "embedded-websocket"))]
 use xrpl::asynch::clients::async_websocket_client::WebsocketOpen;
 #[cfg(feature = "embedded-websocket")]
 use xrpl::asynch::clients::async_websocket_client::{
Original file line number	Diff line number	Diff line change
Expand Up		@@ -18,5 +18,3 @@ Cargo.lock

		# Additional
		src/main.rs

		.DS_Store