Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Additional filters support in my_recent_swaps #784. #796

Merged
merged 13 commits into from
Jan 28, 2021
Merged

Additional filters support in my_recent_swaps #784. #796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
42ce7f5
WIP. Try rusqlite crate.
artemii235 Jan 13, 2021
cca0dcb
WIP. Try rusqlite crate.
artemii235 Jan 13, 2021
86401d5
WIP. Fix clippy.
artemii235 Jan 13, 2021
a0fdf14
WIP. Added SQLite DB init and migration. TODO: insert swaps data into…
artemii235 Jan 15, 2021
393c3a4
WIP. Indexed existing swaps to SQLite on DB migration.
artemii235 Jan 18, 2021
882e259
Merge remote-tracking branch 'origin/mm2.1' into mm2.1-swaps-history-…
artemii235 Jan 19, 2021
e42451c
WIP. Insert new started swaps data to SQLite.
artemii235 Jan 20, 2021
4ec6252
WIP. Added SQL selection of uuids depending on MyRecentSwapsReq.
artemii235 Jan 22, 2021
ebc3bcb
WIP. Refactor recent swaps uuids select to named params.
artemii235 Jan 22, 2021
2be3b84
Added from_uuid support for SQLite. Refactoring. Feature finished.
artemii235 Jan 25, 2021
adcc208
Remove +nightly from cargo commands.
artemii235 Jan 26, 2021
be9b0e2
Fixes after review.
artemii235 Jan 27, 2021
35cb867
Set page_number to 1 in my_recent_swaps response
artemii235 Jan 28, 2021
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
75 changes: 74 additions & 1 deletion Cargo.lock
View file
Open in desktop

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

1 change: 1 addition & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ serde_derive = "1.0"
serialization = { git = "https://github.com/artemii235/parity-bitcoin.git" }
serialization_derive = { git = "https://github.com/artemii235/parity-bitcoin.git" }
sp-trie = "2.0.0"
sql-builder = "3.1.1"

# Pin `term` to 0.5.1 because `dirs` is not portable, cf.
# https://github.com/Stebalien/term/commit/84cfdb51775b327fedf21784749d862fdffa10b4#diff-80398c5faae3c069e4e6aa2ed11b28c0
Expand Down
9 changes: 5 additions & 4 deletions azure-pipelines-build-stage-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,24 +35,25 @@ jobs:
mkdir upload
echo 2.1.$(Build.BuildId)_$(Build.SourceBranchName)_$(COMMIT_HASH)_$(Agent.OS)_Release > MM_VERSION
cat MM_VERSION
cargo +nightly build --features native --release
cargo build --features native --release
displayName: 'Build MM2 Release'
# Explicit --test-threads=16 makes testing process slightly faster on agents that have <16 CPU cores.
- bash: |
cargo +nightly test --features native --all -- --test-threads=16
cargo test --features native --all -- --test-threads=16
displayName: 'Test MM2'
timeoutInMinutes: 22
env:
BOB_PASSPHRASE: $(${{ parameters.bob_passphrase }})
BOB_USERPASS: $(${{ parameters.bob_userpass }})
ALICE_PASSPHRASE: $(${{ parameters.alice_passphrase }})
ALICE_USERPASS: $(${{ parameters.alice_userpass }})
RUST_LOG: debug
- bash: |
cargo +nightly clippy --features native -- -D warnings
cargo clippy --features native -- -D warnings
displayName: 'Check Clippy warnings'
condition: eq( variables['Agent.OS'], 'Linux' )
- bash: |
cargo +nightly fmt -- --check
cargo fmt -- --check
displayName: 'Check rustfmt warnings'
condition: eq( variables['Agent.OS'], 'Linux' )
- bash: |
Expand Down
4 changes: 2 additions & 2 deletions azure-pipelines-release-stage-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
mm2_builder \
/bin/bash -c "source /root/.cargo/env && cargo build --features native -vv --target-dir target-xenial"
else
cargo +nightly build --features native -vv
cargo build --features native -vv
fi
displayName: 'Build MM2 Debug'
condition: eq( variables['DEBUG_UPLOADED'], '' )
Expand Down Expand Up @@ -95,7 +95,7 @@ jobs:
mm2_builder \
/bin/bash -c "source /root/.cargo/env && cargo build --features native --release -vv --target-dir target-xenial"
else
cargo +nightly build --features native --release -vv
cargo build --features native --release -vv
fi
displayName: 'Build MM2 Release'
condition: eq( variables['RELEASE_UPLOADED'], '' )
Expand Down
Loading