src/ -> core/

MuxinFeng · Jun 20, 2019 · a5c78de · a5c78de
1 parent d489f0d
commit a5c78de
Show file tree

Hide file tree

Showing 102 changed files with 18 additions and 18 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,14 +1,14 @@
 [workspace]
 members = [
-    "src/data_restore",
-    "src/key_generator",
-    "src/merkle_tree",
-    "src/eth_client",
-    "src/models",
-    "src/plasma",
-    "src/prover",
-    "src/sandbox",
-    "src/server",
-    "src/storage",
-    "src/circuit",
+    "core/data_restore",
+    "core/key_generator",
+    "core/merkle_tree",
+    "core/eth_client",
+    "core/models",
+    "core/plasma",
+    "core/prover",
+    "core/sandbox",
+    "core/server",
+    "core/storage",
+    "core/circuit",
 ]
diff --git a/Makefile b/Makefile
@@ -49,7 +49,7 @@ db-reset: confirm_action db-drop db-setup db-insert-contract
 	@echo database is ready
 
 db-migrate: confirm_action
-	@cd src/storage && diesel migration run
+	@cd core/storage && diesel migration run
 
 db-drop: confirm_action
 	@# this is used to clear the produciton db; cannot do `diesel database reset` because we don't own the db
@@ -299,4 +299,4 @@ tesseracts-up:
 	@docker-compose up -d tesseracts
 
 tesseracts-down:
-	@docker-compose stop tesseracts
+	@docker-compose stop tesseracts
diff --git a/README.md b/README.md
@@ -89,9 +89,9 @@ Client UI will be available at http://localhost:8080
 
 ## Database migrations
 
-- ```cd src/storage```
+- ```cd core/storage```
 - Add diesel migration
-- Rename `src/storage/schema.rs.generated` to `schema.rs`
+- Rename `core/storage/schema.rs.generated` to `schema.rs`
 - Run tests: ```franklin db-tests```
 
 ## Generating keys
@@ -129,4 +129,4 @@ So you need to rebuild the code on every change (to be automated).
 
 ```
 franklin flatten source
-```
+```
diff --git a/bin/db-setup b/bin/db-setup
@@ -3,7 +3,7 @@
 # Force read env
 FRANKLIN_ENV=
 . .setup_env
-cd src/storage
+cd core/storage
 
 echo DATABASE_URL=$DATABASE_URL
 diesel database setup || exit 1

diff --git a/bin/db-test b/bin/db-test
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 . .setup_env
-cd src/storage
+cd core/storage
 
 export DATABASE_URL=postgres://postgres@localhost/plasma_test
 

diff --git a/src/circuit/Cargo.toml → core/circuit/Cargo.toml b/src/circuit/Cargo.toml → core/circuit/Cargo.toml
diff --git a/src/circuit/src/cheque/bitwindow.rs → core/circuit/src/cheque/bitwindow.rs b/src/circuit/src/cheque/bitwindow.rs → core/circuit/src/cheque/bitwindow.rs
diff --git a/src/circuit/src/cheque/mod.rs → core/circuit/src/cheque/mod.rs b/src/circuit/src/cheque/mod.rs → core/circuit/src/cheque/mod.rs
diff --git a/src/circuit/src/deposit/circuit.rs → core/circuit/src/deposit/circuit.rs b/src/circuit/src/deposit/circuit.rs → core/circuit/src/deposit/circuit.rs
diff --git a/src/circuit/src/deposit/deposit_request.rs → core/circuit/src/deposit/deposit_request.rs b/src/circuit/src/deposit/deposit_request.rs → core/circuit/src/deposit/deposit_request.rs
diff --git a/src/circuit/src/deposit/mod.rs → core/circuit/src/deposit/mod.rs b/src/circuit/src/deposit/mod.rs → core/circuit/src/deposit/mod.rs
diff --git a/src/circuit/src/encoder.rs → core/circuit/src/encoder.rs b/src/circuit/src/encoder.rs → core/circuit/src/encoder.rs
diff --git a/src/circuit/src/exit/circuit.rs → core/circuit/src/exit/circuit.rs b/src/circuit/src/exit/circuit.rs → core/circuit/src/exit/circuit.rs
diff --git a/src/circuit/src/exit/exit_request.rs → core/circuit/src/exit/exit_request.rs b/src/circuit/src/exit/exit_request.rs → core/circuit/src/exit/exit_request.rs
diff --git a/src/circuit/src/exit/mod.rs → core/circuit/src/exit/mod.rs b/src/circuit/src/exit/mod.rs → core/circuit/src/exit/mod.rs
diff --git a/src/circuit/src/leaf.rs → core/circuit/src/leaf.rs b/src/circuit/src/leaf.rs → core/circuit/src/leaf.rs
diff --git a/src/circuit/src/lib.rs → core/circuit/src/lib.rs b/src/circuit/src/lib.rs → core/circuit/src/lib.rs
diff --git a/src/circuit/src/plasma_constants.rs → core/circuit/src/plasma_constants.rs b/src/circuit/src/plasma_constants.rs → core/circuit/src/plasma_constants.rs
diff --git a/src/circuit/src/transfer/circuit.rs → core/circuit/src/transfer/circuit.rs b/src/circuit/src/transfer/circuit.rs → core/circuit/src/transfer/circuit.rs
diff --git a/src/circuit/src/transfer/mod.rs → core/circuit/src/transfer/mod.rs b/src/circuit/src/transfer/mod.rs → core/circuit/src/transfer/mod.rs
diff --git a/src/circuit/src/transfer/transaction.rs → core/circuit/src/transfer/transaction.rs b/src/circuit/src/transfer/transaction.rs → core/circuit/src/transfer/transaction.rs
diff --git a/src/data_restore/Cargo.toml → core/data_restore/Cargo.toml b/src/data_restore/Cargo.toml → core/data_restore/Cargo.toml
diff --git a/src/data_restore/src/accounts_state/mod.rs → core/data_restore/src/accounts_state/mod.rs b/src/data_restore/src/accounts_state/mod.rs → core/data_restore/src/accounts_state/mod.rs
diff --git a/src/data_restore/src/block_events/mod.rs → core/data_restore/src/block_events/mod.rs b/src/data_restore/src/block_events/mod.rs → core/data_restore/src/block_events/mod.rs
diff --git a/src/data_restore/src/blocks/mod.rs → core/data_restore/src/blocks/mod.rs b/src/data_restore/src/blocks/mod.rs → core/data_restore/src/blocks/mod.rs
diff --git a/src/data_restore/src/data_restore_driver.rs → core/data_restore/src/data_restore_driver.rs b/src/data_restore/src/data_restore_driver.rs → core/data_restore/src/data_restore_driver.rs
diff --git a/...a_restore/src/franklin_transaction/mod.rs → ...a_restore/src/franklin_transaction/mod.rs b/...a_restore/src/franklin_transaction/mod.rs → ...a_restore/src/franklin_transaction/mod.rs
diff --git a/src/data_restore/src/helpers/mod.rs → core/data_restore/src/helpers/mod.rs b/src/data_restore/src/helpers/mod.rs → core/data_restore/src/helpers/mod.rs
diff --git a/src/data_restore/src/lib.rs → core/data_restore/src/lib.rs b/src/data_restore/src/lib.rs → core/data_restore/src/lib.rs
diff --git a/src/eth_client/Cargo.toml → core/eth_client/Cargo.toml b/src/eth_client/Cargo.toml → core/eth_client/Cargo.toml
diff --git a/src/eth_client/src/lib.rs → core/eth_client/src/lib.rs b/src/eth_client/src/lib.rs → core/eth_client/src/lib.rs
diff --git a/src/eth_client/src/signer.rs → core/eth_client/src/signer.rs b/src/eth_client/src/signer.rs → core/eth_client/src/signer.rs
diff --git a/src/key_generator/Cargo.toml → core/key_generator/Cargo.toml b/src/key_generator/Cargo.toml → core/key_generator/Cargo.toml
diff --git a/src/key_generator/src/depositor_key.rs → core/key_generator/src/depositor_key.rs b/src/key_generator/src/depositor_key.rs → core/key_generator/src/depositor_key.rs
diff --git a/src/key_generator/src/exitor_key.rs → core/key_generator/src/exitor_key.rs b/src/key_generator/src/exitor_key.rs → core/key_generator/src/exitor_key.rs
diff --git a/src/key_generator/src/main.rs → core/key_generator/src/main.rs b/src/key_generator/src/main.rs → core/key_generator/src/main.rs
diff --git a/src/key_generator/src/read_write_keys.rs → core/key_generator/src/read_write_keys.rs b/src/key_generator/src/read_write_keys.rs → core/key_generator/src/read_write_keys.rs
diff --git a/src/key_generator/src/transactor_key.rs → core/key_generator/src/transactor_key.rs b/src/key_generator/src/transactor_key.rs → core/key_generator/src/transactor_key.rs
diff --git a/...ey_generator/src/vk_contract_generator.rs → ...ey_generator/src/vk_contract_generator.rs b/...ey_generator/src/vk_contract_generator.rs → ...ey_generator/src/vk_contract_generator.rs
diff --git a/src/merkle_tree/Cargo.toml → core/merkle_tree/Cargo.toml b/src/merkle_tree/Cargo.toml → core/merkle_tree/Cargo.toml
diff --git a/src/merkle_tree/src/account_tree.rs → core/merkle_tree/src/account_tree.rs b/src/merkle_tree/src/account_tree.rs → core/merkle_tree/src/account_tree.rs
diff --git a/src/merkle_tree/src/hasher.rs → core/merkle_tree/src/hasher.rs b/src/merkle_tree/src/hasher.rs → core/merkle_tree/src/hasher.rs
diff --git a/src/merkle_tree/src/lib.rs → core/merkle_tree/src/lib.rs b/src/merkle_tree/src/lib.rs → core/merkle_tree/src/lib.rs
diff --git a/src/merkle_tree/src/parallel_smt.rs → core/merkle_tree/src/parallel_smt.rs b/src/merkle_tree/src/parallel_smt.rs → core/merkle_tree/src/parallel_smt.rs
diff --git a/src/merkle_tree/src/pedersen_hasher.rs → core/merkle_tree/src/pedersen_hasher.rs b/src/merkle_tree/src/pedersen_hasher.rs → core/merkle_tree/src/pedersen_hasher.rs
diff --git a/src/merkle_tree/src/sequential_smt.rs → core/merkle_tree/src/sequential_smt.rs b/src/merkle_tree/src/sequential_smt.rs → core/merkle_tree/src/sequential_smt.rs
diff --git a/src/models/Cargo.toml → core/models/Cargo.toml b/src/models/Cargo.toml → core/models/Cargo.toml
diff --git a/src/models/src/abi.rs → core/models/src/abi.rs b/src/models/src/abi.rs → core/models/src/abi.rs
diff --git a/src/models/src/config.rs → core/models/src/config.rs b/src/models/src/config.rs → core/models/src/config.rs
diff --git a/src/models/src/lib.rs → core/models/src/lib.rs b/src/models/src/lib.rs → core/models/src/lib.rs
diff --git a/src/models/src/plasma/account.rs → core/models/src/plasma/account.rs b/src/models/src/plasma/account.rs → core/models/src/plasma/account.rs
diff --git a/src/models/src/plasma/block.rs → core/models/src/plasma/block.rs b/src/models/src/plasma/block.rs → core/models/src/plasma/block.rs
diff --git a/src/models/src/plasma/circuit/account.rs → core/models/src/plasma/circuit/account.rs b/src/models/src/plasma/circuit/account.rs → core/models/src/plasma/circuit/account.rs
diff --git a/src/models/src/plasma/circuit/deposit.rs → core/models/src/plasma/circuit/deposit.rs b/src/models/src/plasma/circuit/deposit.rs → core/models/src/plasma/circuit/deposit.rs
diff --git a/src/models/src/plasma/circuit/exit.rs → core/models/src/plasma/circuit/exit.rs b/src/models/src/plasma/circuit/exit.rs → core/models/src/plasma/circuit/exit.rs
diff --git a/src/models/src/plasma/circuit/mod.rs → core/models/src/plasma/circuit/mod.rs b/src/models/src/plasma/circuit/mod.rs → core/models/src/plasma/circuit/mod.rs
diff --git a/src/models/src/plasma/circuit/sig.rs → core/models/src/plasma/circuit/sig.rs b/src/models/src/plasma/circuit/sig.rs → core/models/src/plasma/circuit/sig.rs
diff --git a/src/models/src/plasma/circuit/transfer.rs → core/models/src/plasma/circuit/transfer.rs b/src/models/src/plasma/circuit/transfer.rs → core/models/src/plasma/circuit/transfer.rs
diff --git a/src/models/src/plasma/circuit/utils.rs → core/models/src/plasma/circuit/utils.rs b/src/models/src/plasma/circuit/utils.rs → core/models/src/plasma/circuit/utils.rs
diff --git a/src/models/src/plasma/mod.rs → core/models/src/plasma/mod.rs b/src/models/src/plasma/mod.rs → core/models/src/plasma/mod.rs
diff --git a/src/models/src/plasma/params.rs → core/models/src/plasma/params.rs b/src/models/src/plasma/params.rs → core/models/src/plasma/params.rs
diff --git a/src/models/src/plasma/tx.rs → core/models/src/plasma/tx.rs b/src/models/src/plasma/tx.rs → core/models/src/plasma/tx.rs
diff --git a/src/models/src/primitives.rs → core/models/src/primitives.rs b/src/models/src/primitives.rs → core/models/src/primitives.rs
diff --git a/src/plasma/Cargo.toml → core/plasma/Cargo.toml b/src/plasma/Cargo.toml → core/plasma/Cargo.toml
diff --git a/src/plasma/src/lib.rs → core/plasma/src/lib.rs b/src/plasma/src/lib.rs → core/plasma/src/lib.rs
diff --git a/src/plasma/src/state.rs → core/plasma/src/state.rs b/src/plasma/src/state.rs → core/plasma/src/state.rs
diff --git a/src/prover/Cargo.toml → core/prover/Cargo.toml b/src/prover/Cargo.toml → core/prover/Cargo.toml
diff --git a/src/prover/src/lib.rs → core/prover/src/lib.rs b/src/prover/src/lib.rs → core/prover/src/lib.rs
diff --git a/src/prover/src/main.rs → core/prover/src/main.rs b/src/prover/src/main.rs → core/prover/src/main.rs
diff --git a/src/sandbox/Cargo.toml → core/sandbox/Cargo.toml b/src/sandbox/Cargo.toml → core/sandbox/Cargo.toml
diff --git a/src/sandbox/src/main.rs → core/sandbox/src/main.rs b/src/sandbox/src/main.rs → core/sandbox/src/main.rs
diff --git a/src/sandbox/src/nonce_futures.rs → core/sandbox/src/nonce_futures.rs b/src/sandbox/src/nonce_futures.rs → core/sandbox/src/nonce_futures.rs
diff --git a/src/server/Cargo.toml → core/server/Cargo.toml b/src/server/Cargo.toml → core/server/Cargo.toml
diff --git a/src/server/src/analysis.pgsql → core/server/src/analysis.pgsql b/src/server/src/analysis.pgsql → core/server/src/analysis.pgsql
diff --git a/src/server/src/api_server.rs → core/server/src/api_server.rs b/src/server/src/api_server.rs → core/server/src/api_server.rs
diff --git a/src/server/src/committer.rs → core/server/src/committer.rs b/src/server/src/committer.rs → core/server/src/committer.rs
diff --git a/src/server/src/eth_sender.rs → core/server/src/eth_sender.rs b/src/server/src/eth_sender.rs → core/server/src/eth_sender.rs
diff --git a/src/server/src/eth_watch.rs → core/server/src/eth_watch.rs b/src/server/src/eth_watch.rs → core/server/src/eth_watch.rs
diff --git a/src/server/src/lib.rs → core/server/src/lib.rs b/src/server/src/lib.rs → core/server/src/lib.rs
diff --git a/src/server/src/main.rs → core/server/src/main.rs b/src/server/src/main.rs → core/server/src/main.rs
diff --git a/src/server/src/nonce_futures.rs → core/server/src/nonce_futures.rs b/src/server/src/nonce_futures.rs → core/server/src/nonce_futures.rs
diff --git a/src/server/src/state_keeper.rs → core/server/src/state_keeper.rs b/src/server/src/state_keeper.rs → core/server/src/state_keeper.rs
diff --git a/src/storage/.gitignore → core/storage/.gitignore b/src/storage/.gitignore → core/storage/.gitignore
diff --git a/src/storage/Cargo.toml → core/storage/Cargo.toml b/src/storage/Cargo.toml → core/storage/Cargo.toml
diff --git a/src/storage/diesel.toml → core/storage/diesel.toml b/src/storage/diesel.toml → core/storage/diesel.toml
diff --git a/...00000000000_diesel_initial_setup/down.sql → ...00000000000_diesel_initial_setup/down.sql b/...00000000000_diesel_initial_setup/down.sql → ...00000000000_diesel_initial_setup/down.sql
diff --git a/...0000000000000_diesel_initial_setup/up.sql → ...0000000000000_diesel_initial_setup/up.sql b/...0000000000000_diesel_initial_setup/up.sql → ...0000000000000_diesel_initial_setup/up.sql
diff --git a/...ons/2018-12-11-084553_operations/down.sql → ...ons/2018-12-11-084553_operations/down.sql b/...ons/2018-12-11-084553_operations/down.sql → ...ons/2018-12-11-084553_operations/down.sql
diff --git a/...tions/2018-12-11-084553_operations/up.sql → ...tions/2018-12-11-084553_operations/up.sql b/...tions/2018-12-11-084553_operations/up.sql → ...tions/2018-12-11-084553_operations/up.sql
diff --git a/...rations/2019-04-02-100645_proofs/down.sql → ...rations/2019-04-02-100645_proofs/down.sql b/...rations/2019-04-02-100645_proofs/down.sql → ...rations/2019-04-02-100645_proofs/down.sql
diff --git a/...igrations/2019-04-02-100645_proofs/up.sql → ...igrations/2019-04-02-100645_proofs/up.sql b/...igrations/2019-04-02-100645_proofs/up.sql → ...igrations/2019-04-02-100645_proofs/up.sql
diff --git a/...s/2019-05-02-110639_transactions/down.sql → ...s/2019-05-02-110639_transactions/down.sql b/...s/2019-05-02-110639_transactions/down.sql → ...s/2019-05-02-110639_transactions/down.sql
diff --git a/...ons/2019-05-02-110639_transactions/up.sql → ...ons/2019-05-02-110639_transactions/up.sql b/...ons/2019-05-02-110639_transactions/up.sql → ...ons/2019-05-02-110639_transactions/up.sql
diff --git a/...rations/2019-05-08-114230_config/down.sql → ...rations/2019-05-08-114230_config/down.sql b/...rations/2019-05-08-114230_config/down.sql → ...rations/2019-05-08-114230_config/down.sql
diff --git a/...igrations/2019-05-08-114230_config/up.sql → ...igrations/2019-05-08-114230_config/up.sql b/...igrations/2019-05-08-114230_config/up.sql → ...igrations/2019-05-08-114230_config/up.sql
diff --git a/...ations/2019-05-16-130227_provers/down.sql → ...ations/2019-05-16-130227_provers/down.sql b/...ations/2019-05-16-130227_provers/down.sql → ...ations/2019-05-16-130227_provers/down.sql
diff --git a/...grations/2019-05-16-130227_provers/up.sql → ...grations/2019-05-16-130227_provers/up.sql b/...grations/2019-05-16-130227_provers/up.sql → ...grations/2019-05-16-130227_provers/up.sql
diff --git a/src/storage/sql/active_provers.pgsql → core/storage/sql/active_provers.pgsql b/src/storage/sql/active_provers.pgsql → core/storage/sql/active_provers.pgsql
diff --git a/src/storage/sql/prover-runs.pgsql → core/storage/sql/prover-runs.pgsql b/src/storage/sql/prover-runs.pgsql → core/storage/sql/prover-runs.pgsql
diff --git a/src/storage/sql/tps.pgsql → core/storage/sql/tps.pgsql b/src/storage/sql/tps.pgsql → core/storage/sql/tps.pgsql
diff --git a/src/storage/src/lib.rs → core/storage/src/lib.rs b/src/storage/src/lib.rs → core/storage/src/lib.rs
diff --git a/src/storage/src/schema.rs → core/storage/src/schema.rs b/src/storage/src/schema.rs → core/storage/src/schema.rs