Skip to content

Commit

Permalink
Changed features config
Browse files Browse the repository at this point in the history
  • Loading branch information
mrLSD committed Jan 4, 2023
1 parent 52cf2a0 commit 9573342
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 18 deletions.
4 changes: 2 additions & 2 deletions .env/custom_example.env
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
#
# Simply remove the prefixed `#` to enable them.

# The cargo features should either be `mainnet`, `testnet` or something extra in order to make use
# The cargo features should either be `mainnet`, `default` or something extra in order to make use
# of your own custom features.
#CARGO_FEATURES_BUILD = "mainnet"

# The cargo test features are used to build a test environment version of the fungible-token WASM and test
# library. Either use `mainnet-test`, `testnet-test` or something extra in order to make use of your
# library. Either use something extra in order to make use of your
# own custom features.
#CARGO_FEATURES_BUILD_TEST = "mainnet,integration-test"

Expand Down
2 changes: 1 addition & 1 deletion .env/local.env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CARGO_FEATURES_BUILD = "testnet"
CARGO_FEATURES_BUILD = "mainnet"
RUSTC_FLAGS_BUILD = "-C link-arg=-s"
NEAR_EVM_ACCOUNT = "aurora.test.near"
WASM_FILE = "aurora-eth-connector-local.wasm"
Expand Down
2 changes: 1 addition & 1 deletion .env/mainnet.env
Original file line number Diff line number Diff line change
@@ -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 = "mainnet-test"
CARGO_FEATURES_TEST = ""
RUSTC_FLAGS_BUILD = "-C link-arg=-s"
NEAR_EVM_ACCOUNT = "aurora"
WASM_FILE = "aurora-eth-connector-mainnet.wasm"
Expand Down
8 changes: 4 additions & 4 deletions .env/testnet.env
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
CARGO_FEATURES_BUILD = "testnet"
CARGO_FEATURES_BUILD_MIGRATION = "testnet,migration"
CARGO_FEATURES_BUILD_TEST = "testnet,integration-test,migration"
CARGO_FEATURES_TEST = "testnet-test"
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-testnet.wasm"
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
name: Tests
jobs:
test:
name: Test suite (mainnet, testnet)
name: Test suite (mainnet)
runs-on: [self-hosted, heavy]
steps:
- name: Clone the repository
Expand All @@ -18,10 +18,6 @@ jobs:
run: cargo make --profile mainnet build-test
- name: Test mainnet
run: cargo make --profile mainnet test-workspace
- name: Build testnet test WASM
run: cargo make --profile testnet build-test
- name: Test testnet
run: cargo make --profile testnet test-workspace

env:
CARGO_TERM_COLOR: always
Expand Down
5 changes: 1 addition & 4 deletions eth-connector-tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,11 @@ near-primitives = "0.5"
near-units = "0.2"
near-contract-standards = "4.1"
tokio = { version = "1.14", features = ["full"] }
workspaces = "0.7"
workspaces = "0.7.0"
byte-slice-cast = "1.2"
hex = "0.4.3"
ethabi = "17.1"
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]
mainnet-test = []
testnet-test = []

3 changes: 2 additions & 1 deletion eth-connector/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ rand = "0.8.5"
[features]
log = []
integration-test = ["log"]
# Currently feature `mainnet` used only for
# Makefile.toml profiles to indicate basic features
mainnet = ["log"]
testnet = ["log"]
migration = ["log"]

0 comments on commit 9573342

Please sign in to comment.