Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions .github/workflows/basic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ jobs:
with:
toolchain: ${{ matrix.rust-version }}
targets: wasm32-unknown-unknown
- name: Add wasm32 target
run: rustup target add wasm32-unknown-unknown
- name: Build
run: make build

Expand All @@ -37,8 +35,6 @@ jobs:
with:
toolchain: ${{ matrix.rust-version }}
targets: wasm32-unknown-unknown
- name: Add wasm32 target
run: rustup target add wasm32-unknown-unknown
- name: Run tests
run: make test

Expand All @@ -52,12 +48,11 @@ jobs:
steps:
- name: Checkout sources
uses: actions/checkout@v4

- name: Install Rust toolchain with components
uses: actions-rs/toolchain@v1
- name: Install stable toolchain
uses: dtolnay/rust-toolchain@stable
with:
toolchain: ${{ matrix.rust-version }}
override: true
targets: wasm32-unknown-unknown
components: rustfmt, clippy
target: wasm32-unknown-unknown

Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ jobs:
with:
toolchain: ${{ matrix.rust-version }}
targets: wasm32-unknown-unknown
- name: Add wasm32 target
run: rustup target add wasm32-unknown-unknown
- name: Install tarpaulin
run: cargo install cargo-tarpaulin --version 0.30.0
- run: make build
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ jobs:
with:
toolchain: ${{ matrix.rust-version }}
targets: wasm32-unknown-unknown
- name: Add wasm32 target
run: rustup target add wasm32-unknown-unknown
- name: Build artifacts
run: make build
- name: Generate checksums
Expand Down
12 changes: 12 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 28 additions & 0 deletions contracts/pool_blended/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
[package]
name = "phoenix-pool-blended"
version = { workspace = true }
authors = ["Jakub <jakub@moonbite.space>"]
repository = { workspace = true }
edition = { workspace = true }
license = { workspace = true }

[lib]
crate-type = ["cdylib"]

[features]
testutils = ["soroban-sdk/testutils"]
upgrade = []

[lints]
workspace = true

[dependencies]
soroban-decimal = { workspace = true }
phoenix = { workspace = true }
num-integer = { workspace = true }
soroban-sdk = { workspace = true }

[dev-dependencies]
soroban-sdk = { workspace = true, features = ["testutils"] }
pretty_assertions = { workspace = true }
test-case = "3.3.1"
22 changes: 22 additions & 0 deletions contracts/pool_blended/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
default: all

all: lint build test

test: build # because of token dependency
cargo test

build:
$(MAKE) -C ../token build || break;
$(MAKE) -C ../stake build || break;
cargo build --target wasm32-unknown-unknown --release

lint: fmt clippy

fmt:
cargo fmt --all

clippy: build
cargo clippy --all-targets -- -D warnings -A clippy::too_many_arguments

clean:
cargo clean
Loading
Loading