Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Update Cargo.lock #11573

Merged
merged 2 commits into from
Mar 24, 2020
Merged

Update Cargo.lock #11573

merged 2 commits into from
Mar 24, 2020

Conversation

vorot93
Copy link

@vorot93 vorot93 commented Mar 17, 2020

Ran into Cargo.lock conflicts while working on #11540, figured that instead of untangling it, might just update everything.

Copy link
Collaborator

@dvdplm dvdplm left a comment

Choose a reason for hiding this comment

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

This has been generally frowned upon previously. Personally I actually don't mind it (better take the hit of random bugs up front than defer to the day it becomes inevitable) but let's hear from @niklasad1 and @ordian.

@niklasad1
Copy link
Collaborator

niklasad1 commented Mar 17, 2020

You executed cargo update?

This has been generally frowned upon previously. Personally I actually don't mind it (better take the hit of random bugs up front than defer to the day it becomes inevitable

I agree.
It's just hard to review it properly i.e, some crates might have even changed their MAJOR
label (e.g. nom, which) or bring in other dependencies. However, really nice that it compiles without any code changes 🎉

@ordian
Copy link
Collaborator

ordian commented Mar 17, 2020

test failure on macOS is legit, seems like the test

---- v1::tests::mocked::signing_unsafe::rpc_eth_send_transaction_with_bad_to stdout ----
thread 'v1::tests::mocked::signing_unsafe::rpc_eth_send_transaction_with_bad_to' panicked at 'assertion failed: `(left == right)` (left: `Some("{\"jsonrpc\":\"2.0\",\"error\":{\"code\":-32602,\"message\":\"Invalid params: 0x prefix is missing.\"},\"id\":1}")`, right: `Some("{\"jsonrpc\":\"2.0\",\"error\":{\"code\":-32602,\"message\":\"Invalid params: prefix is missing.\"},\"id\":1}")`, diff: `Some("{\"jsonrpc\":\"2.0\",\"error\":{\"code\":-32602,\"message\":\"Invalid params: 0x prefix is missing.\"},\"id\":1}") `)', rpc/src/v1/tests/mocked/signing_unsafe.rs:215:5

needs to be updated

I don't mind the update in general, what I don't like though, is that it mixes insubstantial updates with changes like librocksdb-sys 6.2.4 -> 6.6.4, which can have a huge impact.

@niklasad1
Copy link
Collaborator

test failure on macOS is legit, seems like the test

So, we are only running the tests on macOS?

@vorot93

This should fix it:

diff --git a/rpc/src/v1/tests/mocked/signing_unsafe.rs b/rpc/src/v1/tests/mocked/signing_unsafe.rs
index 0c5a81d28..e1438b7a5 100644
--- a/rpc/src/v1/tests/mocked/signing_unsafe.rs
+++ b/rpc/src/v1/tests/mocked/signing_unsafe.rs
@@ -210,7 +210,7 @@ fn rpc_eth_send_transaction_with_bad_to() {
 		"id": 1
 	}"#;
 
-	let response = r#"{"jsonrpc":"2.0","error":{"code":-32602,"message":"Invalid params: prefix is missing."},"id":1}"#;
+	let response = r#"{"jsonrpc":"2.0","error":{"code":-32602,"message":"Invalid params: 0x prefix is missing."},"id":1}"#;
 
 	assert_eq!(tester.io.handle_request_sync(&request), Some(response.into()));
 }

@ordian
Copy link
Collaborator

ordian commented Mar 18, 2020

So, we are only running the tests on macOS?

No, github actions automatically cancels other jobs in case of a failure.

Cargo.lock Show resolved Hide resolved
@@ -1105,9 +1061,12 @@ dependencies = [

[[package]]
name = "error-chain"
Copy link
Collaborator

@niklasad1 niklasad1 Mar 23, 2020

Choose a reason for hiding this comment

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

hrm, I thought we got rid of error-chain completely. Seems to be related to ethabi though (bumping to v11 should fix it I guess)

@vorot93 vorot93 merged commit 0ac15a0 into master Mar 24, 2020
@vorot93 vorot93 deleted the vorot93/update-deps branch March 24, 2020 06:47
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants