Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add list of services to enable (ECR-1766) & bundle btc-anchoring (ECR-1366) #338

Merged
merged 17 commits into from
Jul 7, 2018
Merged

Add list of services to enable (ECR-1766) & bundle btc-anchoring (ECR-1366) #338

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
7a03275
Add list of services to enable [ECR-1766]
Jul 3, 2018
2017463
Bundle anchoring service into EJB App [ECR-1366]
Jul 3, 2018
0a5cbe2
Use constants
Jul 3, 2018
ee5d386
Fix script & newlines
Jul 4, 2018
b7972b3
Massive refactoring
Jul 4, 2018
f1d1410
Remove ejb_app_services file
Jul 4, 2018
12ba83d
Merge remote-tracking branch 'remotes/upstream/master' into ECR-1766
Jul 5, 2018
7c1e73d
Remove static bound
Jul 5, 2018
c0e0ccc
Move implementation to separate module
Jul 5, 2018
da8f28d
Split implementation to functions
Jul 5, 2018
d7137e3
Add tests
Jul 5, 2018
99554b9
Run EJB App tests on Travis
Jul 5, 2018
112bf35
Fail if invalid config
Jul 6, 2018
ac14ae6
Add comment
Jul 6, 2018
d96d178
Merge branch 'master' into ECR-1766
dmitry-timofeev Jul 6, 2018
de86ec1
Fix tests & remove invalid comment
Jul 7, 2018
6ac9526
Fix unused variable
Jul 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions exonum-java-binding-core/rust/ejb-app/src/node_builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,6 @@ mod tests {
fn broken_config() {
let cfg = create_config("broken.toml", "not_list = 1");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shan't we throw in this case?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmmm... No, be just use default config... I'll consider panicing

let services_to_enable = services_to_enable(cfg);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unused variable seems to break clippy (shall it be prefixed with an underscore?).

assert_eq!(services_to_enable.len(), 2);
assert!(services_to_enable.contains(EJB_SERVICE));
assert!(services_to_enable.contains(CONFIGURATION_SERVICE));
}

#[test]
Expand Down
1 change: 0 additions & 1 deletion run_ejb_app_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/usr/bin/env bash
# Runs EJB App tests (ejb-core/rust/ejb-app).
Copy link
Contributor

@dmitry-timofeev dmitry-timofeev Jul 6, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why don't we call run_ejb_app_tests.sh from run_all_tests.sh run_native_integration_tests.sh?

Edit: I see, we do call from run_all_tests. Does it belong there or in native_its?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's just separated tests, not native_its

# If --skip-compile is passed, does not recompile all Java sources.
#
# ¡Keep it MacOS/Ubuntu compatible!

Expand Down