Merge pull request #67 from Scattered-Systems/v0.2.2

v0.2.2
Scattered-Systems · May 11, 2024 · e10e1dc · e10e1dc
2 parents 1cc7caa + 190e0ae
commit e10e1dc
Show file tree

Hide file tree

Showing 71 changed files with 663 additions and 798 deletions.
diff --git a/.github/ISSUE_TEMPLATE/SCIP.md b/.github/ISSUE_TEMPLATE/SCIP.md
@@ -1,10 +1,10 @@
 ---
-name: Improvement Proposal
-about: This template aides in the creation of ecosystem improvement proposals indicated by the prefix SCIP-
+about: A template outlining the structure of a formal proposal for a project improvement.
+assignees:
+    - 'FL03 <jo3mccain@icloud.com> (https://github.com/FL03)'
+name: Project Improvement Proposals
+labels: ['scip']
 title: 'SCIP-'
-labels: ''
-assignees: ''
-
 ---
 
 **Abstract**
@@ -18,3 +18,5 @@ A clear and concise description of any alternative solutions or features you've
 
 **Discussion**
 Add any other context or screenshots about the feature request here.
+
+### Additional Resources
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -3,32 +3,28 @@ updates:
   - package-ecosystem: cargo
     directory: /
     schedule:
-      interval: daily
+      interval: weekly
   - package-ecosystem: github-actions
     directory: /
     schedule:
-          interval: daily
+      interval: weekly
   - package-ecosystem: cargo
     directory: /actors
     schedule:
-      interval: daily
+      interval: weekly
   - package-ecosystem: cargo
     directory: /core
     schedule:
-      interval: daily
+      interval: weekly
   - package-ecosystem: cargo
     directory: /derive
     schedule:
-      interval: daily
+      interval: weekly
   - package-ecosystem: cargo
     directory: /macros
     schedule:
-      interval: daily
+      interval: weekly
   - package-ecosystem: cargo
     directory: /scsys
     schedule:
-      interval: daily
-  - package-ecosystem: cargo
-    directory: /stores
-    schedule:
-      interval: daily
+      interval: weekly
diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml
@@ -7,15 +7,10 @@ concurrency:
 on:
   pull_request:
     branches: [ main ]
-  push:
-    branches: [ main ]
-    tags: [ nightly*,  v*.*.* ]
   release:
     types: [ created ]
   repository_dispatch:
     types: [ clippy ]
-  schedule:
-    - cron: 30 21 * * 0 # Every Sunday at 9:30PM UTC
   workflow_dispatch:
 
 permissions:

diff --git a/.github/workflows/crates.yml b/.github/workflows/crates.yml
@@ -9,44 +9,37 @@ env:
 
 on:
   release:
-    types: [created]
+    types: [ created ]
   repository_dispatch:
-    types: [publish]
+    types: [ crates-io ]
   workflow_dispatch:
 
 jobs:
   core:
     name: Publish (core)
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        package: [ core ]
-    env:
-      PACKAGE_NAME: ${{ github.event.repository.name }}-${{ matrix.package }}
     steps:
       - uses: actions/checkout@v4
-      - name: Publish (${{ env.PACKAGE_NAME }})
-        run: cargo publish --all-features -v -p ${{ env.PACKAGE_NAME }} --token ${{ secrets.CARGO_REGISTRY_TOKEN }}
+      - name: publish
+        run: cargo publish --all-features -v -p ${{ github.event.repository.name }}-core --token ${{ secrets.CARGO_REGISTRY_TOKEN }}
   features:
     name: Publish (features)
     needs: core
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        package: [ actors, derive, macros, stores ]
+        package: [ actors, derive, macros, ]
     env:
       PACKAGE_NAME: ${{ github.event.repository.name }}-${{ matrix.package }}
     steps:
       - uses: actions/checkout@v4
       - name: Publish (${{ env.PACKAGE_NAME }})
         run: cargo publish --all-features -v -p ${{ env.PACKAGE_NAME }} --token ${{ secrets.CARGO_REGISTRY_TOKEN }}
   sdk:
-    env:
-      PACKAGE_NAME: ${{ github.event.repository.name }}
     name: Publish (sdk)
     needs: features
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Publish (${{ env.PACKAGE_NAME }})
-        run: cargo publish --all-features -v -p ${{ env.PACKAGE_NAME }} --token ${{ secrets.CARGO_REGISTRY_TOKEN }}
+      - name: publish
+        run: cargo publish --all-features -v -p ${{ github.event.repository.name }} --token ${{ secrets.CARGO_REGISTRY_TOKEN }}
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -8,15 +8,12 @@ env:
   CARGO_TERM_COLOR: always
 
 on:
-  push:
+  pull_request:
     branches: [ main ]
-    tags: [ nightly*,  v*.*.* ]
   release:
     types: [ created ]
   repository_dispatch:
     types: [ rust ]
-  schedule:
-    - cron: 30 21 * * 0 # Every Sunday at 9:30pm UTC
   workflow_dispatch:
 
 jobs:
@@ -45,29 +42,23 @@ jobs:
             target/release
           key: ${{ matrix.toolchain }}-${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
   test:
-    name: Test
+    name: Test (workspace)
     needs: [ builder ]
     strategy:
       matrix:
+        flags: [ --no-default-features, --all-features ]
         toolchain: [ stable, nightly ]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: setup (langspace)
-        run: |
-          rustup update
-          rustup default ${{ matrix.toolchain }}
-      - name: Test
-        run: cargo test --all -F full --release -v
+      - run: rustup default ${{ matrix.toolchain }} && rustup update
+      - name: ${{ matrix.flags }}
+        run: cargo test ${{ matrix.flags }} -r -v --workspace
   bench:
     name: Benchmark
     needs: [ builder ]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: setup (langspace)
-        run: |
-          rustup update
-          rustup default nightly
-      - name: Bench
-        run: cargo bench --all -F full -v
+      - run: rustup default nightly && rustup update
+      - run: cargo bench --all-features -v --workspace
diff --git a/.gitignore b/.gitignore
@@ -1,61 +1,12 @@
-# Config
-**/config.*
-**/*.config.*
 
-**/*.env
-**/*.env.*
 
-# Directories
-**/__pycache__/
-**/__sapper__/
-
-**/.DS_STORE/
-**/.artifacts/data/
-**/.cache/
-**/.docker/data/
-**/.idea/
-**/.pytest_cache/
-**/.svelte-kit/
-**/.vscode/
-
-**/artifacts/
-**/build/
-**/debug/
-**/dist/
-**/env/
-**/node_modules/
+### Rust
 **/target/
-**/venv/
-
-# File Extensions
-**/*.bk
-**/*.bk.*
-
-**/*.csv
-**/*.csv.*
-
-**/*.db
-**/*.db.*
 
-**/*.db-*.*
+**/Cargo.lock
 
-**/*.lock
-**/*.lock.*
-
-**/*-lock.*
-
-**/*.log
-**/*.log.*
-
-**/*.whl
-**/*.whl.*
-
-**/*.zip
-**/*.zip.*
+**/*.bk
+**/*.bk-*
 
-# Exceptions
-!**/.circleci/config.*
-!**/default.config.*
-!**/*.env.example
-!**/*.config.js
-!**/*.config.cjs
+*-log.*
+**/log.*
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,40 +1,37 @@
 [workspace.package]
 authors = ["FL03 <jo3mccain@icloud.com> (https://github.com/FL03)", "Scattered-Systems (https://github.com/scattered-systems)"]
 categories = []
-description = "scsys lays the foundation for the Scattered-Systems ecosystem, delivering critical primitives throughout"
+description = "scsys is a collection of primitives and utilities for use throughout the ecosystem."
 edition = "2021"
 homepage = "https://github.com/scattered-systems/scsys/wiki"
 keywords = ["blockchain", "primitives", "scsys"]
 license = "Apache-2.0"
 readme = "README.md"
 repository = "https://github.com/scattered-systems/scsys"
-version = "0.2.1"
-
-[workspace.dependencies]
-paste = "1"
-smart-default = "0.7"
-strum = { features = ["derive"], version = "0.26" }
+version = "0.2.2"
 
 [workspace]
 default-members = [
     "scsys",
 ]
 
-exclude = [
-    "examples/*",
-]
+exclude = []
 
 members = [
     "actors",
     "core",
     "derive",
     "macros",
-    "scsys", 
-    "stores",
+    "scsys",
 ]
 
 resolver = "2"
 
+[workspace.dependencies]
+paste = "1"
+smart-default = "0.7"
+strum = { default-features = false, features = ["derive"], version = "0.26" }
+
 [profile.dev]
 codegen-units = 256
 debug = true

diff --git a/actors/Cargo.toml b/actors/Cargo.toml
@@ -1,5 +1,6 @@
 [package]
 authors.workspace = true
+build = "build.rs"
 categories.workspace = true
 description.workspace = true
 edition.workspace = true
@@ -22,18 +23,16 @@ full = [
     "tokio"
 ]
 
-serde = [
-    "dep:serde",
-    "serde-ext",
-    "scsys-core/serde",
-]
+# *** [FF] Dependencies ***
 
-serde-ext = [
-    "dep:serde_json",
+alloc = [
+    "scsys-core/alloc",
+    "serde?/alloc",
 ]
 
-std = [
-    "scsys-core/std",
+serde = [
+    "dep:serde",
+    "scsys-core/serde",
 ]
 
 tokio = [
@@ -45,12 +44,21 @@ tokio-ext = [
     "tokio/sync",
 ]
 
+# *** [FF] Environments ***
+
+std = [
+    "futures/std",
+    "scsys-core/std",
+    "serde?/std",
+    "strum/std",
+]
+
 wasi = [
-    "scsys-core/wasi"
+    "scsys-core/wasi",
 ]
 
 wasm = [
-    "scsys-core/wasm"
+    "scsys-core/wasm",
 ]
 
 [lib]
@@ -61,19 +69,30 @@ test = true
 
 [dependencies]
 async-trait = "0.1"
-futures = "0.3"
 glob = "0.3"
 paste.workspace = true
-serde = { optional = true, features = ["derive"], version = "1" }
-serde_json = { optional = true, version = "1" }
 smart-default.workspace = true
 strum.workspace = true
-tokio = { optional = true, version = "1" }
+
+[dependencies.futures]
+default-features = false
+version = "0.3"
 
 [dependencies.scsys-core]
+default-features = false
 path = "../core"
-version = "0.2.1"
-# version = "0.2.1-nightly"
+version = "0.2.2"
+# version = "0.2.2-nightly"
+
+[dependencies.serde]
+default-features = false
+features = ["derive"]
+optional = true
+version = "1"
+
+[dependencies.tokio]
+optional = true
+version = "1"
 
 [dev-dependencies]