From 8169527874f4e737749d792fcf83d1800623e056 Mon Sep 17 00:00:00 2001 From: Bo Yao Date: Fri, 21 Feb 2020 14:15:48 -0800 Subject: [PATCH 1/3] Avoid panic while panicking because of actix isn't running --- core/primitives/src/test_utils.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/primitives/src/test_utils.rs b/core/primitives/src/test_utils.rs index 2fe3277e7ad..34943d2a766 100644 --- a/core/primitives/src/test_utils.rs +++ b/core/primitives/src/test_utils.rs @@ -74,7 +74,9 @@ pub fn init_stop_on_panic() { let default_hook = std::panic::take_hook(); std::panic::set_hook(Box::new(move |info| { default_hook(info); - actix::System::with_current(|sys| sys.stop_with_code(1)); + let _ = std::panic::catch_unwind(|| { + actix::System::with_current(|sys| sys.stop_with_code(1)); + }); })); }) } From e5455bc0d7810c9cfd4593ab741aafdcf196311f Mon Sep 17 00:00:00 2001 From: Bo Yao Date: Mon, 24 Feb 2020 15:17:27 -0800 Subject: [PATCH 2/3] patch actix --- Cargo.lock | 22 +++++++++++----------- Cargo.toml | 3 +++ core/primitives/src/test_utils.rs | 4 ++-- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 412d7c81607..b76343bb42c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6,7 +6,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "actix-http 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-rt 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-rt 1.0.0 (git+https://github.com/ailisp/actix-net)", "actix_derive 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -44,7 +44,7 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "actix-codec 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-rt 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-rt 1.0.0 (git+https://github.com/ailisp/actix-net)", "actix-service 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "actix-utils 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -76,7 +76,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "actix-codec 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "actix-connect 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-rt 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-rt 1.0.0 (git+https://github.com/ailisp/actix-net)", "actix-service 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "actix-threadpool 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "actix-tls 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -140,7 +140,7 @@ dependencies = [ [[package]] name = "actix-rt" version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" +source = "git+https://github.com/ailisp/actix-net#3295aabf6747d37598acf62a63bc9d9071e50895" dependencies = [ "actix-macros 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "actix-threadpool 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -155,7 +155,7 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "actix-codec 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-rt 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-rt 1.0.0 (git+https://github.com/ailisp/actix-net)", "actix-service 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "actix-utils 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -182,7 +182,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "actix-macros 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-rt 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-rt 1.0.0 (git+https://github.com/ailisp/actix-net)", "actix-server 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "actix-service 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -210,7 +210,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "actix-codec 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-rt 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-rt 1.0.0 (git+https://github.com/ailisp/actix-net)", "actix-service 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "actix-utils 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -227,7 +227,7 @@ version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "actix-codec 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-rt 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-rt 1.0.0 (git+https://github.com/ailisp/actix-net)", "actix-service 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -247,7 +247,7 @@ dependencies = [ "actix-http 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "actix-macros 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "actix-router 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-rt 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-rt 1.0.0 (git+https://github.com/ailisp/actix-net)", "actix-server 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "actix-service 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "actix-testing 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -387,7 +387,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "actix-codec 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "actix-http 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-rt 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-rt 1.0.0 (git+https://github.com/ailisp/actix-net)", "actix-service 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4145,7 +4145,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum actix-http 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c16664cc4fdea8030837ad5a845eb231fb93fc3c5c171edfefb52fad92ce9019" "checksum actix-macros 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "21705adc76bbe4bc98434890e73a89cd00c6015e5704a60bb6eea6c3b72316b6" "checksum actix-router 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "9d7a10ca4d94e8c8e7a87c5173aba1b97ba9a6563ca02b0e1cd23531093d3ec8" -"checksum actix-rt 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3f6a0a55507046441a496b2f0d26a84a65e67c8cafffe279072412f624b5fb6d" +"checksum actix-rt 1.0.0 (git+https://github.com/ailisp/actix-net)" = "" "checksum actix-server 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "51d3455eaac03ca3e49d7b822eb35c884b861f715627254ccbe4309d08f1841a" "checksum actix-service 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9fba4171f1952aa15f3cf410facac388d18110b1e8754f84a407ab7f9d5ac7ee" "checksum actix-testing 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "48494745b72d0ea8ff0cf874aaf9b622a3ee03d7081ee0c04edea4f26d32c911" diff --git a/Cargo.toml b/Cargo.toml index 86b857ed03b..43a0f531def 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -90,3 +90,6 @@ expensive_tests = [] regression_tests = [] old_tests = [] adversarial = ["near/adversarial", "near-jsonrpc/adversarial"] + +[patch.crates-io] +actix-rt = { git = 'https://github.com/ailisp/actix-net' } \ No newline at end of file diff --git a/core/primitives/src/test_utils.rs b/core/primitives/src/test_utils.rs index 34943d2a766..d3cf63b8aad 100644 --- a/core/primitives/src/test_utils.rs +++ b/core/primitives/src/test_utils.rs @@ -74,9 +74,9 @@ pub fn init_stop_on_panic() { let default_hook = std::panic::take_hook(); std::panic::set_hook(Box::new(move |info| { default_hook(info); - let _ = std::panic::catch_unwind(|| { + if actix::System::is_set() { actix::System::with_current(|sys| sys.stop_with_code(1)); - }); + } })); }) } From aa8840d436d82e2e582178c744f4e2c5b1b6921f Mon Sep 17 00:00:00 2001 From: Bo Yao Date: Tue, 25 Feb 2020 13:11:52 -0800 Subject: [PATCH 3/3] use official repo after merge --- Cargo.lock | 22 +++++++++++----------- Cargo.toml | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b76343bb42c..c0214cfae6e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6,7 +6,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "actix-http 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-rt 1.0.0 (git+https://github.com/ailisp/actix-net)", + "actix-rt 1.0.0 (git+https://github.com/actix/actix-net?rev=602db1779eb51d60e0fe5a33d725d1d7fdf540fd)", "actix_derive 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -44,7 +44,7 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "actix-codec 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-rt 1.0.0 (git+https://github.com/ailisp/actix-net)", + "actix-rt 1.0.0 (git+https://github.com/actix/actix-net?rev=602db1779eb51d60e0fe5a33d725d1d7fdf540fd)", "actix-service 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "actix-utils 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -76,7 +76,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "actix-codec 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "actix-connect 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-rt 1.0.0 (git+https://github.com/ailisp/actix-net)", + "actix-rt 1.0.0 (git+https://github.com/actix/actix-net?rev=602db1779eb51d60e0fe5a33d725d1d7fdf540fd)", "actix-service 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "actix-threadpool 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "actix-tls 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -140,7 +140,7 @@ dependencies = [ [[package]] name = "actix-rt" version = "1.0.0" -source = "git+https://github.com/ailisp/actix-net#3295aabf6747d37598acf62a63bc9d9071e50895" +source = "git+https://github.com/actix/actix-net?rev=602db1779eb51d60e0fe5a33d725d1d7fdf540fd#602db1779eb51d60e0fe5a33d725d1d7fdf540fd" dependencies = [ "actix-macros 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "actix-threadpool 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -155,7 +155,7 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "actix-codec 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-rt 1.0.0 (git+https://github.com/ailisp/actix-net)", + "actix-rt 1.0.0 (git+https://github.com/actix/actix-net?rev=602db1779eb51d60e0fe5a33d725d1d7fdf540fd)", "actix-service 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "actix-utils 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -182,7 +182,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "actix-macros 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-rt 1.0.0 (git+https://github.com/ailisp/actix-net)", + "actix-rt 1.0.0 (git+https://github.com/actix/actix-net?rev=602db1779eb51d60e0fe5a33d725d1d7fdf540fd)", "actix-server 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "actix-service 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -210,7 +210,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "actix-codec 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-rt 1.0.0 (git+https://github.com/ailisp/actix-net)", + "actix-rt 1.0.0 (git+https://github.com/actix/actix-net?rev=602db1779eb51d60e0fe5a33d725d1d7fdf540fd)", "actix-service 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "actix-utils 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -227,7 +227,7 @@ version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "actix-codec 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-rt 1.0.0 (git+https://github.com/ailisp/actix-net)", + "actix-rt 1.0.0 (git+https://github.com/actix/actix-net?rev=602db1779eb51d60e0fe5a33d725d1d7fdf540fd)", "actix-service 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -247,7 +247,7 @@ dependencies = [ "actix-http 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "actix-macros 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "actix-router 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-rt 1.0.0 (git+https://github.com/ailisp/actix-net)", + "actix-rt 1.0.0 (git+https://github.com/actix/actix-net?rev=602db1779eb51d60e0fe5a33d725d1d7fdf540fd)", "actix-server 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "actix-service 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "actix-testing 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -387,7 +387,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "actix-codec 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "actix-http 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-rt 1.0.0 (git+https://github.com/ailisp/actix-net)", + "actix-rt 1.0.0 (git+https://github.com/actix/actix-net?rev=602db1779eb51d60e0fe5a33d725d1d7fdf540fd)", "actix-service 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4145,7 +4145,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum actix-http 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c16664cc4fdea8030837ad5a845eb231fb93fc3c5c171edfefb52fad92ce9019" "checksum actix-macros 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "21705adc76bbe4bc98434890e73a89cd00c6015e5704a60bb6eea6c3b72316b6" "checksum actix-router 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "9d7a10ca4d94e8c8e7a87c5173aba1b97ba9a6563ca02b0e1cd23531093d3ec8" -"checksum actix-rt 1.0.0 (git+https://github.com/ailisp/actix-net)" = "" +"checksum actix-rt 1.0.0 (git+https://github.com/actix/actix-net?rev=602db1779eb51d60e0fe5a33d725d1d7fdf540fd)" = "" "checksum actix-server 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "51d3455eaac03ca3e49d7b822eb35c884b861f715627254ccbe4309d08f1841a" "checksum actix-service 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9fba4171f1952aa15f3cf410facac388d18110b1e8754f84a407ab7f9d5ac7ee" "checksum actix-testing 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "48494745b72d0ea8ff0cf874aaf9b622a3ee03d7081ee0c04edea4f26d32c911" diff --git a/Cargo.toml b/Cargo.toml index 43a0f531def..f14da334bd6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -92,4 +92,4 @@ old_tests = [] adversarial = ["near/adversarial", "near-jsonrpc/adversarial"] [patch.crates-io] -actix-rt = { git = 'https://github.com/ailisp/actix-net' } \ No newline at end of file +actix-rt = { git = "https://github.com/actix/actix-net", rev="602db1779eb51d60e0fe5a33d725d1d7fdf540fd" } \ No newline at end of file