ref: turn contracts into a crate

Cargo.toml

@@ -1,5 +1,5 @@
 [workspace]
-members = ["contracts/*", "lib/*"]
+members = ["contracts", "lib/*"]
 # Explicitly set the resolver to version 2, which is the default for packages
 # with edition >= 2021.
 # https://doc.rust-lang.org/edition-guide/rust-2021/default-cargo-resolver.html

contracts/token/Cargo.toml → contracts/Cargo.toml

@@ -1,7 +1,8 @@
 [package]
-name = "token"
+# TODO: Figure out public name before v0.1.0 release.
+name = "contracts"
 categories = ["no-std", "wasm"]
-description = "Token Standards for Stylus"
+description = "Contracts for Stylus"
 edition.workspace = true
 keywords.workspace = true
 license.workspace = true
@@ -16,11 +17,12 @@ stylus-proc = { version = "0.4.3", default-features = false }
 mini-alloc = "0.4.2"
 
 [dev-dependencies]
-test-utils = { path = "../test-utils" }
+wavm-shims = { path = "../lib/wavm-shims" }
 
 [features]
 default = []
 erc20 = []
+erc721 = []
 
 [lib]
 # The Stylus team sets new crates with the following types:

contracts/README.md

@@ -0,0 +1 @@
+# Contracts

contracts/token/src/erc20/mod.rs → contracts/src/erc20/mod.rs

@@ -348,10 +348,10 @@ mod tests {
         msg,
         storage::{StorageMap, StorageType, StorageU256},
     };
-    #[allow(unused_imports)]
-    use test_utils::*;
 
     use crate::erc20::{Error, ERC20};
+    #[allow(unused_imports)]
+    use crate::test_utils;
 
     impl Default for ERC20 {
         fn default() -> Self {

contracts/src/erc721/mod.rs

@@ -0,0 +1 @@
+

contracts/token/src/lib.rs → contracts/src/lib.rs

@@ -1,4 +1,4 @@
-#![doc = include_str!("../README.md")]
+#![doc = include_str!("../../README.md")]
 #![warn(missing_docs, unreachable_pub, rust_2021_compatibility)]
 #![warn(clippy::all, clippy::pedantic)]
 #![cfg_attr(not(test), no_std, no_main)]
@@ -9,6 +9,13 @@ static ALLOC: mini_alloc::MiniAlloc = mini_alloc::MiniAlloc::INIT;
 
 #[cfg(any(test, erc20))]
 pub mod erc20;
+#[cfg(any(test, erc721))]
+pub mod erc721;
+#[cfg(test)]
+mod test_utils;
+
+#[cfg(test)]
+extern crate std;
 
 #[cfg(not(any(test, target_arch = "wasm32-unknown-unknown")))]
 #[panic_handler]

contracts/test-utils/src/lib.rs → contracts/src/test_utils.rs

@@ -1,7 +1,7 @@
 //! Unit-testing utilities for Stylus contracts.
 use std::sync::{Mutex, MutexGuard};
 
-pub use wavm_shims::*;
+pub(crate) use wavm_shims::*;
 
 /// A global static mutex.
 ///
@@ -10,15 +10,15 @@ pub use wavm_shims::*;
 /// accesses storage in an non-overlapping manner.
 ///
 /// See [`with_storage`].
-pub static STORAGE_MUTEX: Mutex<()> = Mutex::new(());
+pub(crate) static STORAGE_MUTEX: Mutex<()> = Mutex::new(());
 
 /// Acquires access to storage.
-pub fn acquire_storage() -> MutexGuard<'static, ()> {
+pub(crate) fn acquire_storage() -> MutexGuard<'static, ()> {
     STORAGE_MUTEX.lock().unwrap()
 }
 
 /// Decorates a closure by running it with exclusive access to storage.
-pub fn with_storage<C: Default>(closure: impl FnOnce(&mut C)) {
+pub(crate) fn with_storage<C: Default>(closure: impl FnOnce(&mut C)) {
     let _lock = acquire_storage();
     let mut contract = C::default();
     closure(&mut contract);