Merge pull request #16 from aurora-is-near/feat/remove-relayer-and-fee

Feat: remove relayer and fee
Near-One · Feb 21, 2023 · 7f31306 · 7f31306
2 parents 1dd41fe + d348a38
commit 7f31306
Show file tree

Hide file tree

Showing 11 changed files with 221 additions and 271 deletions.
diff --git a/.env/development.env b/.env/development.env
@@ -0,0 +1,10 @@
+CARGO_FEATURES_BUILD = "mainnet"
+CARGO_FEATURES_BUILD_MIGRATION = "mainnet,migration"
+CARGO_FEATURES_BUILD_TEST = "mainnet,integration-test,migration"
+CARGO_FEATURES_TEST = ""
+RUSTC_FLAGS_BUILD = "-C link-arg=-s"
+NEAR_EVM_ACCOUNT = "aurora"
+WASM_FILE = "aurora-eth-connector-mainnet.wasm"
+WASM_FILE_TEST = "aurora-eth-connector-test.wasm"
+NEAR_CLI = "near"
+IS_PROD = true
diff --git a/.env/mainnet.env b/.env/mainnet.env
@@ -1,7 +1,7 @@
 CARGO_FEATURES_BUILD = "mainnet"
 CARGO_FEATURES_BUILD_MIGRATION = "mainnet,migration"
 CARGO_FEATURES_BUILD_TEST = "mainnet,integration-test,migration"
-CARGO_FEATURES_TEST = ""
+CARGO_FEATURES_TEST = "migration-tests"
 RUSTC_FLAGS_BUILD = "-C link-arg=-s"
 NEAR_EVM_ACCOUNT = "aurora"
 WASM_FILE = "aurora-eth-connector-mainnet.wasm"

diff --git a/.env/testnet.env b/.env/testnet.env
@@ -1,7 +1,7 @@
 CARGO_FEATURES_BUILD = "mainnet"
 CARGO_FEATURES_BUILD_MIGRATION = "mainnet,migration"
 CARGO_FEATURES_BUILD_TEST = "mainnet,integration-test,migration"
-CARGO_FEATURES_TEST = ""
+CARGO_FEATURES_TEST = "migration-tests"
 RUSTC_FLAGS_BUILD = "-C link-arg=-s"
 NEAR_EVM_ACCOUNT = "aurora"
 WASM_FILE = "aurora-eth-connector-testnet.wasm"

diff --git a/Makefile.toml b/Makefile.toml
@@ -3,7 +3,7 @@ env_files = [
     { path = ".env/testnet.env", profile = "testnet" },
     { path = ".env/local.env", profile = "local" },
     { path = ".env/custom.env", profile = "custom" },
-    { path = ".env/local.env", profile = "development" },
+    { path = ".env/development.env", profile = "development" },
 ]
 
 [config]
@@ -142,7 +142,7 @@ args = [
 ]
 
 [tasks.build-test]
-condition = { profiles = ["mainnet", "testnet", "custom"] }
+condition = { profiles = ["mainnet", "testnet", "development", "custom"] }
 env = { "RUSTFLAGS" = "${RUSTC_FLAGS_BUILD}", "CARGO_FEATURES" = "${CARGO_FEATURES_BUILD_TEST}", "WASM_FILE" = "${WASM_FILE_TEST}", "RELEASE" = "--release", "TARGET_DIR" = "release" }
 category = "Build"
 run_task = "build-contract-flow"
@@ -169,7 +169,7 @@ category = "Build"
 run_task = "build-contract-flow"
 
 [tasks.test-workspace]
-condition = { profiles = ["mainnet", "testnet", "custom"] }
+condition = { profiles = ["mainnet", "testnet", "development", "custom"] }
 category = "Test"
 command = "${CARGO}"
 args = [

diff --git a/eth-connector-tests/Cargo.toml b/eth-connector-tests/Cargo.toml
@@ -29,3 +29,4 @@ rlp = { version = "0.5.0", default-features = false }
 aurora-engine-migration-tool = { git = "https://github.com/aurora-is-near/aurora-engine-migration-tool.git" }
 
 [features]
+migration-tests = []
Original file line number	Diff line number	Diff line change
Expand Up		@@ -29,3 +29,4 @@ rlp = { version = "0.5.0", default-features = false }
		aurora-engine-migration-tool = { git = "https://github.com/aurora-is-near/aurora-engine-migration-tool.git" }

		[features]
		migration-tests = []