Removed old style API code

near · Nov 25, 2021 · 41cbe0a · 41cbe0a
1 parent 5ec44cb
commit 41cbe0a
Show file tree

Hide file tree

Showing 18 changed files with 22 additions and 840 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,5 @@
 [workspace]
 members = [
     "workspaces",
-    "workspaces-macros",
     "examples",
 ]
diff --git a/workspaces-macros/Cargo.toml b/workspaces-macros/Cargo.toml
diff --git a/workspaces-macros/src/entry.rs b/workspaces-macros/src/entry.rs
diff --git a/workspaces-macros/src/lib.rs b/workspaces-macros/src/lib.rs
diff --git a/workspaces/Cargo.toml b/workspaces/Cargo.toml
@@ -4,8 +4,6 @@ version = "0.1.0"
 edition = "2018"
 
 [dependencies]
-workspaces-macros = { version = "0.1.0", path = "../workspaces-macros" }
-
 async-trait = "0.1"
 actix = "=0.11.0-beta.2"
 actix_derive = "=0.6.0-beta.1"

diff --git a/workspaces/src/lib.rs b/workspaces/src/lib.rs
@@ -6,18 +6,6 @@ mod worker;
 
 pub mod prelude;
 
-#[cfg(not(test))] // Work around for rust-lang/rust#62127
-pub use workspaces_macros::main;
-pub use workspaces_macros::test;
-
 pub use exports::*;
-pub use rpc::api::*;
-pub use runtime::{SandboxRuntime, TestnetRuntime};
-
 pub use network::{Contract, DevNetwork, Network};
 pub use worker::{sandbox, testnet, with_sandbox, with_testnet, Worker};
-
-// Used for generated code, Not a public API
-#[doc(hidden)]
-#[path = "private/mod.rs"]
-pub mod __private;
diff --git a/workspaces/src/network/sandbox.rs b/workspaces/src/network/sandbox.rs
@@ -8,14 +8,15 @@ use async_trait::async_trait;
 use near_crypto::{InMemorySigner, Signer};
 use near_primitives::types::{AccountId, Balance};
 
-use crate::rpc::client::Client;
-use crate::runtime::local::SandboxServer;
-use crate::NEAR_BASE;
-
 use super::{
     Account, AllowDevAccountCreation, AllowStatePatching, CallExecution, Contract, NetworkActions,
     NetworkClient, NetworkInfo, TopLevelAccountCreator,
 };
+use crate::rpc::client::Client;
+use crate::runtime::local::SandboxServer;
+
+// Constant taken from nearcore crate to avoid dependency
+pub(crate) const NEAR_BASE: Balance = 1_000_000_000_000_000_000_000_000;
 
 const DEFAULT_DEPOSIT: Balance = 100 * NEAR_BASE;
 
@@ -25,7 +26,7 @@ pub struct Sandbox {
 }
 
 impl Sandbox {
-    fn home_dir(port: u16) -> PathBuf {
+    pub(crate) fn home_dir(port: u16) -> PathBuf {
         let mut path = std::env::temp_dir();
         path.push(format!("sandbox-{}", port));
         path

diff --git a/workspaces/src/private/mod.rs b/workspaces/src/private/mod.rs