Skip to content

Runtime warning cleanup #193

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

Merged
mnaamani merged 2 commits into from
Mar 12, 2020
Merged

Runtime warning cleanup #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1cdecf
Clean content-working-group tests
shamil-gadelshin Mar 11, 2020
bfcab70
Update obsolete code in the runtime/build.rs
shamil-gadelshin Mar 11, 2020
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
56 changes: 4 additions & 52 deletions runtime-modules/content-working-group/src/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,17 +511,11 @@ fn begin_curator_applicant_review_success() {
let opening =
<hiring::OpeningById<Test>>::get(&normal_opening_constructed.curator_opening_id);
match opening.stage {
hiring::OpeningStage::Active {
stage,
applications_added,
active_application_count,
unstaking_application_count,
deactivated_application_count,
} => {
hiring::OpeningStage::Active { stage, .. } => {
Copy link
Member

@mnaamani mnaamani Mar 12, 2020

Choose a reason for hiding this comment

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

nice, I learned the proper way now to ignore fields in match statements 👍

match stage {
hiring::ActiveOpeningStage::ReviewPeriod {
started_accepting_applicants_at_block,
started_review_period_at_block,
..
} => {
/* OK */
// assert_eq!(started_accepting_applicants_at_block, 0);
Expand Down Expand Up @@ -921,12 +915,6 @@ impl UpdateCuratorRoleAccountFixture {

assert_eq!(self.new_role_account, event_new_role_account);
}

pub fn call_and_assert_failed_result(&self, error_message: &'static str) {
let call_result = self.call();

assert_eq!(call_result, Err(error_message));
}
}

#[test]
Expand Down Expand Up @@ -958,6 +946,7 @@ struct UpdateCuratorRewardAccountFixture {
}

impl UpdateCuratorRewardAccountFixture {
#[allow(dead_code)] // delete if the method is unnecessary
Copy link
Member

@mnaamani mnaamani Mar 12, 2020

Choose a reason for hiding this comment

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

what is different about these methods that we are allowing dead_code rather than removing like in other fixtures?

fn call(&self) -> Result<(), &'static str> {
ContentWorkingGroup::update_curator_reward_account(
self.origin.clone(),
Expand All @@ -966,6 +955,7 @@ impl UpdateCuratorRewardAccountFixture {
)
}

#[allow(dead_code)] // delete if the method is unnecessary
pub fn call_and_assert_success(&self) {
let _original_curator = CuratorById::<Test>::get(self.curator_id);

Expand Down Expand Up @@ -996,12 +986,6 @@ impl UpdateCuratorRewardAccountFixture {

assert_eq!(self.new_reward_account, event_reward_account);
}

pub fn call_and_assert_failed_result(&self, error_message: &'static str) {
let call_result = self.call();

assert_eq!(call_result, Err(error_message));
}
}

#[test]
Expand Down Expand Up @@ -1076,12 +1060,6 @@ impl LeaveCuratorRoleFixture {
* recurringrewards, stake
*/
}

pub fn call_and_assert_failed_result(&self, error_message: &'static str) {
let call_result = self.call();

assert_eq!(call_result, Err(error_message));
}
}

#[test]
Expand Down Expand Up @@ -1155,12 +1133,6 @@ impl TerminateCuratorRoleFixture {
* recurringrewards, stake
*/
}

pub fn call_and_assert_failed_result(&self, error_message: &'static str) {
let call_result = self.call();

assert_eq!(call_result, Err(error_message));
}
}

#[test]
Expand Down Expand Up @@ -1224,16 +1196,6 @@ impl SetLeadFixture {
crate::RawEvent::LeadSet(new_lead_id)
);
}

pub fn call_and_assert_failed_result(&self, error_message: &'static str) {
let number_of_events_before_call = System::events().len();

let call_result = self.call();

assert_eq!(call_result, Err(error_message));

assert_eq!(System::events().len(), number_of_events_before_call);
}
}

#[test]
Expand Down Expand Up @@ -1288,16 +1250,6 @@ impl UnsetLeadFixture {
crate::RawEvent::LeadUnset(original_lead_id)
);
}

pub fn call_and_assert_failed_result(&self, error_message: &'static str) {
let number_of_events_before_call = System::events().len();

let call_result = self.call();

assert_eq!(call_result, Err(error_message));

assert_eq!(System::events().len(), number_of_events_before_call);
}
}

#[test]
Expand Down
21 changes: 13 additions & 8 deletions runtime/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,26 @@
// along with Substrate. If not, see <http://www.gnu.org/licenses/>.

use std::{env, process::Command, string::String};
use wasm_builder_runner::{build_current_project_with_rustflags, WasmBuilderSource};
use wasm_builder_runner::{WasmBuilder, WasmBuilderSource};

fn main() {
if !in_real_cargo_environment() {
env::set_var("BUILD_DUMMY_WASM_BINARY", "1");
println!("Building DUMMY Wasm binary");
}

build_current_project_with_rustflags(
"wasm_binary.rs",
WasmBuilderSource::Crates("1.0.8"),
// This instructs LLD to export __heap_base as a global variable, which is used by the
// external memory allocator.
"-Clink-arg=--export=__heap_base",
);
let file_name = "wasm_binary.rs";
let wasm_builder_source = WasmBuilderSource::Crates("1.0.8");
// This instructs LLD to export __heap_base as a global variable, which is used by the
// external memory allocator.
let default_rust_flags = "-Clink-arg=--export=__heap_base";

WasmBuilder::new()
.with_current_project()
.with_wasm_builder_source(wasm_builder_source)
.append_to_rust_flags(default_rust_flags)
.set_file_name(file_name)
.build()
}

fn in_real_cargo_environment() -> bool {
Expand Down