Reorganize files

alexkeating · Aug 5, 2021 · 4bcc62d · 4bcc62d
1 parent dd26668
commit 4bcc62d
Show file tree

Hide file tree

Showing 20 changed files with 46 additions and 13 deletions.
diff --git a/Makefile b/Makefile
@@ -1,15 +1,23 @@
 MOLOCH_ACCOUNT_ID=$(shell grep MOLOCH_ACCOUNT_ID .env | cut -d "=" -f2)
 
 build:
-	./build.sh
+	./scripts/build.sh
 
 deploy:
 	$(MAKE) build
-	./deploy.sh
+	./scripts/deploy.sh
 
 clean:
-	./clean.sh
+	./scripts/clean.sh
 
 deploy_contract:
 	$(MAKE) build
 	near deploy --wasmFile res/moloch.wasm --accountId $(MOLOCH_ACCOUNT_ID).mrkeating.testnet
+
+unit:
+	cd contracts && cargo test --all
+
+end_to_end:
+	$(MAKE) deploy
+	yarn run test
+	$(MAKE) clean
diff --git a/contracts/.gitignore b/contracts/.gitignore
@@ -0,0 +1,29 @@
+/target
+Cargo.lock
+
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+
+# testing
+/coverage
+
+# production
+/build
+
+# misc
+.DS_Store
+.env
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+*/packages/kubernetes/*
diff --git a/Cargo.toml → contracts/Cargo.toml b/Cargo.toml → contracts/Cargo.toml
diff --git a/moloch/Cargo.toml → contracts/moloch/Cargo.toml b/moloch/Cargo.toml → contracts/moloch/Cargo.toml
diff --git a/moloch/src/ft_callbacks.rs → contracts/moloch/src/ft_callbacks.rs b/moloch/src/ft_callbacks.rs → contracts/moloch/src/ft_callbacks.rs
@@ -29,9 +29,7 @@ impl FungibleTokenReceiver for Moloch {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use near_sdk::test_utils::{
-        get_created_receipts, get_logs, testing_env_with_promise_results, VMContextBuilder,
-    };
+    use near_sdk::test_utils::{testing_env_with_promise_results, VMContextBuilder};
     use near_sdk::{testing_env, Balance, MockedBlockchain, PromiseResult, VMContext};
     use std::convert::TryInto;
 

diff --git a/moloch/src/guild_bank.rs → contracts/moloch/src/guild_bank.rs b/moloch/src/guild_bank.rs → contracts/moloch/src/guild_bank.rs
diff --git a/moloch/src/lib.rs → contracts/moloch/src/lib.rs b/moloch/src/lib.rs → contracts/moloch/src/lib.rs
@@ -6,9 +6,7 @@ use near_contract_standards::fungible_token::core_impl::ext_fungible_token;
 use near_sdk::borsh::{self, BorshDeserialize, BorshSerialize};
 use near_sdk::collections::{LookupMap, UnorderedMap, Vector};
 use near_sdk::json_types::{U128, U64};
-use near_sdk::{
-    env, ext_contract, near_bindgen, setup_alloc, AccountId, Balance, PanicOnDefault, Promise,
-};
+use near_sdk::{env, near_bindgen, setup_alloc, AccountId, Balance, PanicOnDefault, Promise};
 
 use serde::{Deserialize, Serialize};
 

diff --git a/moloch/src/proposal_escrow.rs → contracts/moloch/src/proposal_escrow.rs b/moloch/src/proposal_escrow.rs → contracts/moloch/src/proposal_escrow.rs
diff --git a/moloch/src/storage_impl.rs → contracts/moloch/src/storage_impl.rs b/moloch/src/storage_impl.rs → contracts/moloch/src/storage_impl.rs
diff --git a/res/moloch.wasm → contracts/res/moloch.wasm b/res/moloch.wasm → contracts/res/moloch.wasm
diff --git a/res/test_fungible_token.wasm → contracts/res/test_fungible_token.wasm b/res/test_fungible_token.wasm → contracts/res/test_fungible_token.wasm
diff --git a/test-fungible-token/Cargo.toml → contracts/test-fungible-token/Cargo.toml b/test-fungible-token/Cargo.toml → contracts/test-fungible-token/Cargo.toml
diff --git a/test-fungible-token/src/lib.rs → contracts/test-fungible-token/src/lib.rs b/test-fungible-token/src/lib.rs → contracts/test-fungible-token/src/lib.rs
diff --git a/tests/sim/main.rs → contracts/tests/sim/main.rs b/tests/sim/main.rs → contracts/tests/sim/main.rs
diff --git a/tests/sim/test_moloch.rs → contracts/tests/sim/test_moloch.rs b/tests/sim/test_moloch.rs → contracts/tests/sim/test_moloch.rs
diff --git a/tests/sim/test_storage.rs → contracts/tests/sim/test_storage.rs b/tests/sim/test_storage.rs → contracts/tests/sim/test_storage.rs
diff --git a/tests/sim/utils.rs → contracts/tests/sim/utils.rs b/tests/sim/utils.rs → contracts/tests/sim/utils.rs
diff --git a/build.sh → scripts/build.sh b/build.sh → scripts/build.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 set -e
-cd "`dirname $0`"
+cd "./contracts"
 cargo build --all --target wasm32-unknown-unknown --release
-cp target/wasm32-unknown-unknown/release/*.wasm ./res/
+cp ./target/wasm32-unknown-unknown/release/*.wasm ./res/
diff --git a/clean.sh → scripts/clean.sh b/clean.sh → scripts/clean.sh
diff --git a/deploy.sh → scripts/deploy.sh b/deploy.sh → scripts/deploy.sh
@@ -7,8 +7,8 @@ FDAI_ACCOUNT_ID=$(grep FDAI_ACCOUNT_ID .env | cut -d "=" -f2)
 # ten second periods, voting period 20 seconds grace 10 seconds 
 near create-account $MOLOCH_ACCOUNT_ID.mrkeating.testnet --master-account mrkeating.testnet
 near create-account $FDAI_ACCOUNT_ID.mrkeating.testnet --master-account mrkeating.testnet
-near deploy --wasmFile res/test_fungible_token.wasm --accountId $FDAI_ACCOUNT_ID.mrkeating.testnet
+near deploy --wasmFile contracts/res/test_fungible_token.wasm --accountId $FDAI_ACCOUNT_ID.mrkeating.testnet
 near call $FDAI_ACCOUNT_ID.mrkeating.testnet new_default_meta --accountId $FDAI_ACCOUNT_ID.mrkeating.testnet --args '{"owner_id":"mrkeating.testnet","total_supply":"1000000000"}'
 
-near deploy --wasmFile res/moloch.wasm --accountId $MOLOCH_ACCOUNT_ID.mrkeating.testnet
+near deploy --wasmFile contracts/res/moloch.wasm --accountId $MOLOCH_ACCOUNT_ID.mrkeating.testnet
 near call $MOLOCH_ACCOUNT_ID.mrkeating.testnet new --accountId $MOLOCH_ACCOUNT_ID.mrkeating.testnet --args '{"summoner": "mrkeating.testnet", "approved_token": "'$FDAI_ACCOUNT_ID.mrkeating.testnet'", "period_duration": "10000000000", "voting_period_length": "2", "grace_period_length": "1", "abort_window": "2", "proposal_deposit": "10", "dilution_bound": "1", "processing_reward": "1"}'