changes

2025-01-21 16:37:07 -05:00
parent 76a4610903
commit 2153a6ce96
6 changed files with 47 additions and 204 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,181 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 4
-
-[[package]]
-name = "ahash"
-version = "0.8.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
-dependencies = [
- "cfg-if",
- "once_cell",
- "version_check",
- "zerocopy",
-]
-
-[[package]]
-name = "allocator-api2"
-version = "0.2.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
-
-[[package]]
-name = "byteorder"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "getrandom"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.14.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
-dependencies = [
- "ahash",
- "allocator-api2",
-]
-
-[[package]]
-name = "libc"
-version = "0.2.169"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
-
-[[package]]
-name = "lzf1"
-version = "0.1.0"
-dependencies = [
- "hashbrown",
- "rand",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.20.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
-
-[[package]]
-name = "ppv-lite86"
-version = "0.2.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
-dependencies = [
- "zerocopy",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.38"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "rand"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-dependencies = [
- "libc",
- "rand_chacha",
- "rand_core",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-dependencies = [
- "ppv-lite86",
- "rand_core",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-dependencies = [
- "getrandom",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.93"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c786062daee0d6db1132800e623df74274a0a87322d8e183338e01b3d98d058"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
-
-[[package]]
-name = "version_check"
-version = "0.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
-
-[[package]]
-name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
-
-[[package]]
-name = "zerocopy"
-version = "0.7.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
-dependencies = [
- "byteorder",
- "zerocopy-derive",
-]
-
-[[package]]
-name = "zerocopy-derive"
-version = "0.7.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,7 +12,9 @@ opt-level=0
 [profile.release]
 debug = true

+[profile.release]
+debug = true
+
 [dependencies]
 rand="0.8.5"
-hashbrown="0.14.5"

--- a/batchtrades.log
+++ b/batchtrades.log
@@ -0,0 +1,13 @@
+AT Teppy
+AT Luni
+AT Hamza
+AA USD
+AA BTC
+AF 1 0 186A000000000
+AF 1 0 186A000000000
+AF 2 1 600000000
+OR 2 1 200000000 0 186A000000000
+OR 2 1 200000000 0 1D4C000000000
+OR 2 1 200000000 0 30D4000000000
+ORB 1 0 2F9B800000000 1 300000000
+EXE 0 2848800000000 1 300000000
--- a/demo1.log
+++ b/demo1.log
@@ -1,11 +1,8 @@
-AT Teppy
-AT Luni
-AT Hamza
-AA USD
-AA BTC
-SR 0 51EB851 0 0 0
-SR 1 51EB851 0 0 0
-AF 1 1 500000000
-AF 2 0 3D09000000000
-AF 3 0 3D09000000000
-OR 1 1 100000000 0 C35000000000
+OR 2 0 9C4000000000 1 100000000
+OR 3 0 9C4000000000 1 100000000
+NOP Error: Count not find currency
+OR 3 0 9C4000000000 1 100000000
+OR 3 0 C35000000000 1 100000000
+AF 3 0 186A000000000
+OR 3 0 C35000000000 1 100000000
+OR 1 1 100000000 0 9C4000000000
--- a/demox.log
+++ b/demox.log
@@ -1,11 +1,23 @@
-AT Teppy
-AT Luni
-AT Hamza
-AA USD
-AA BTC
-SR 0 51EB851 28F5C28 33333333 19999999
-SR 1 51EB851 28F5C28 33333333 19999999
-AF 1 1 500000000
-AF 2 0 3D09000000000
-AF 3 0 3D09000000000
-OR 1 1 100000000 0 C35000000000
+AT Teppy                                ; addtrader Teppy
+AT Luni                                 ; addtrader Luni
+AT Hamza                                ; addtrader Hamza
+AA USD                                  ; addasset USD
+AA BTC                                  ; addasset BTC
+SR 0 51EB851 28F5C28 7AE147A 28F5C28    ; setroyalty USD 0.02 0.01 0.03 0.01
+SR 1 51EB851 28F5C28 7AE147A 28F5C28    ; setroyalty BTC 0.02 0.01 0.03 0.01
+AF 1 1 500000000                        ; addfunds Teppy 5 BTC
+AF 2 0 186A000000000                    ; addfunds Luni 100000 USD
+AF 3 0 186A000000000                    ; addfunds Hamza 100000 USD
+OR 1 1 200000000 0 186A000000000        ; [login Teppy] order 2 BTC 100000 USD
+NOP OR 2 0 753000000000 1 80000000          ; [login Luni] order 30000 USD 0.5 BTC
+NOP OR 2 0 4E2000000000 1 80000000          ; [login Luni] order 20000 USD 0.5 BTC
+NOP OR 2 0 55F000000000 1 80000000          ; [login Luni] order 22000 USD 0.5 BTC
+NOP OR 2 1 40000000 0 35B600000000          ; [login Luni] order 0.25 BTC 13750 USD
+OR 2 0 9C4000000000 1 100000000
+OR 3 0 9C4000000000 1 100000000
+NOP Error: Count not find currency
+OR 3 0 9C4000000000 1 100000000
+OR 3 0 C35000000000 1 100000000
+AF 3 0 186A000000000
+OR 3 0 C35000000000 1 100000000
+OR 1 1 100000000 0 9C4000000000
--- a/temp.log
+++ b/temp.log