Take solana programs out of workspace (#13)

Cargo.lock

@@ -61,15 +61,6 @@ version = "1.0.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6b602bfe940d21c130f3895acd65221e8a61270debe89d628b9cb4e3ccb8569b"
 
-[[package]]
-name = "arbitrary"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0922a3e746b5a44e111e5603feb6704e5cc959116f66737f50bb5cbd264e9d87"
-dependencies = [
- "derive_arbitrary",
-]
-
 [[package]]
 name = "arc-swap"
 version = "0.4.7"
@@ -82,16 +73,6 @@ version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
 
-[[package]]
-name = "arrayvec"
-version = "0.3.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06f59fe10306bb78facd90d28c2038ad23ffaaefa85bac43c8a434cde383334f"
-dependencies = [
- "nodrop",
- "odds",
-]
-
 [[package]]
 name = "arrayvec"
 version = "0.5.1"
@@ -170,21 +151,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "bit-set"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e11e16035ea35e4e5997b393eacbf6f63983188f7a2ad25bfb13465f5ad59de"
-dependencies = [
- "bit-vec",
-]
-
-[[package]]
-name = "bit-vec"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f0dc55f2d8a1a85650ac47858bb001b4c0dd73d79e3c455a842925e68d29cd3"
-
 [[package]]
 name = "bitflags"
 version = "1.2.1"
@@ -198,7 +164,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a"
 dependencies = [
  "arrayref",
- "arrayvec 0.5.1",
+ "arrayvec",
  "constant_time_eq",
 ]
 
@@ -608,17 +574,6 @@ dependencies = [
  "syn 1.0.40",
 ]
 
-[[package]]
-name = "derive_arbitrary"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0f7c6c81276b6b8702074defbdb1938933ddf98c7f7e0dca8d9e9214dd6c730"
-dependencies = [
- "proc-macro2 1.0.21",
- "quote 1.0.7",
- "syn 1.0.40",
-]
-
 [[package]]
 name = "dialoguer"
 version = "0.6.2"
@@ -1049,16 +1004,6 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "644f9158b2f133fd50f5fb3242878846d9eb792e445c893805ff0e3824006e35"
 
-[[package]]
-name = "hexdump"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "850f3f2c33d20c0f96c4485e087dd580ff041d720988ebf4c84a42acf739262b"
-dependencies = [
- "arrayvec 0.3.25",
- "itertools 0.4.19",
-]
-
 [[package]]
 name = "hidapi"
 version = "1.2.3"
@@ -1219,12 +1164,6 @@ version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "47be2f14c678be2fdcab04ab1171db51b2762ce6f0a8ee87c8dd4a04ed216135"
 
-[[package]]
-name = "itertools"
-version = "0.4.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4a9b56eb56058f43dc66e58f40a214b2ccbc9f3df51861b63d51dec7b65bc3f"
-
 [[package]]
 name = "itertools"
 version = "0.9.0"
@@ -1528,12 +1467,6 @@ dependencies = [
  "void",
 ]
 
-[[package]]
-name = "nodrop"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
-
 [[package]]
 name = "num-derive"
 version = "0.3.2"
@@ -1608,12 +1541,6 @@ version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1ab52be62400ca80aa00285d25253d7f7c437b7375c4de678f5405d3afe82ca5"
 
-[[package]]
-name = "odds"
-version = "0.2.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4eae0151b9dacf24fcc170d9995e511669a082856a91f958a2fe380bfab3fb22"
-
 [[package]]
 name = "once_cell"
 version = "1.4.1"
@@ -1897,37 +1824,6 @@ dependencies = [
  "quote 0.6.13",
 ]
 
-[[package]]
-name = "proptest"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12e6c80c1139113c28ee4670dc50cc42915228b51f56a9e407f0ec60f966646f"
-dependencies = [
- "bit-set",
- "bitflags",
- "byteorder",
- "lazy_static",
- "num-traits",
- "quick-error",
- "rand 0.7.3",
- "rand_chacha 0.2.2",
- "rand_xorshift 0.2.0",
- "regex-syntax",
- "rusty-fork",
- "tempfile",
-]
-
-[[package]]
-name = "proptest-derive"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "051d9d20dbe9e9dfe594328b6eaab72ccf571fee818991dd1c1ba5469b5f32d4"
-dependencies = [
- "proc-macro2 0.4.30",
- "quote 0.6.13",
- "syn 0.15.44",
-]
-
 [[package]]
 name = "quick-error"
 version = "1.2.3"
@@ -1967,7 +1863,7 @@ dependencies = [
  "rand_jitter",
  "rand_os",
  "rand_pcg",
- "rand_xorshift 0.1.1",
+ "rand_xorshift",
  "winapi 0.3.9",
 ]
 
@@ -2099,15 +1995,6 @@ dependencies = [
  "rand_core 0.3.1",
 ]
 
-[[package]]
-name = "rand_xorshift"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77d416b86801d23dde1aa643023b775c3a462efc0ed96443add11546cdf1dca8"
-dependencies = [
- "rand_core 0.5.1",
-]
-
 [[package]]
 name = "rayon"
 version = "1.4.0"
@@ -2311,18 +2198,6 @@ dependencies = [
  "syn 1.0.40",
 ]
 
-[[package]]
-name = "rusty-fork"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f"
-dependencies = [
- "fnv",
- "quick-error",
- "tempfile",
- "wait-timeout",
-]
-
 [[package]]
 name = "ryu"
 version = "1.0.5"
@@ -2492,34 +2367,18 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "serum-safe-program"
-version = "0.1.0"
-dependencies = [
- "serum-common",
- "serum-safe",
- "solana-sdk",
- "spl-token",
-]
-
 [[package]]
 name = "serum_dex"
 version = "0.2.0"
 dependencies = [
- "arbitrary",
  "arrayref",
  "bincode",
- "bumpalo",
  "bytemuck",
  "enumflags2",
  "field-offset",
- "hexdump",
+ "itertools",
- "itertools 0.9.0",
  "num-traits",
  "num_enum",
- "proptest",
- "proptest-derive",
- "rand 0.7.3",
  "safe-transmute",
  "serde",
  "solana-sdk",
@@ -2901,7 +2760,7 @@ dependencies = [
  "generic-array 0.14.4",
  "hex",
  "hmac",
- "itertools 0.9.0",
+ "itertools",
  "log",
  "memmap",
  "num-derive",
@@ -3753,15 +3612,6 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 
-[[package]]
-name = "wait-timeout"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "want"
 version = "0.3.0"

Cargo.toml

@@ -2,8 +2,10 @@
 members = [
     "solana-client-gen",
     "common",
-    "safe",
-    "safe/program",
     "crank",
+    "safe",
+]
+exclude = [
+    "safe/program",
     "dex",
 ]

safe/Makefile

@@ -26,7 +26,7 @@ BPF_SDK=$(shell pwd)/../bin/bpf-sdk
 #
 # Parent dir for the Solana program's build target.
 #
-BUILD_DIR=$(shell pwd)/../target/bpfel-unknown-unknown/release
+BUILD_DIR=$(shell pwd)/program/target/bpfel-unknown-unknown/release
 #
 # The program's crate name.
 #

safe/program/Cargo.toml

@@ -5,6 +5,9 @@ description = "Serum Safe Solana program"
 repository = "https://github.com/project-serum/serum-dex"
 edition = "2018"
 
+# Needed for the encapsulating `serum-safe` crate to be part of the workspace.
+[workspace]
+
 [lib]
 crate-type = ["cdylib", "lib"]
 name = "serum_safe_program"