Skip to content

Update from upstream#1123

Merged
claravanstaden merged 20 commits intomainfrom
update-from-upstream-22-jan
Jan 23, 2024
Merged

Update from upstream#1123
claravanstaden merged 20 commits intomainfrom
update-from-upstream-22-jan

Conversation

@claravanstaden
Copy link
Copy Markdown
Contributor

@claravanstaden claravanstaden commented Jan 22, 2024

Changes to our crates on the upstream polkadot-sdk.

Polkadot-sdk companion: Snowfork/polkadot-sdk#103

@claravanstaden claravanstaden force-pushed the update-from-upstream-22-jan branch from febbec3 to 2d5929a Compare January 23, 2024 06:28
@codecov
Copy link
Copy Markdown

codecov bot commented Jan 23, 2024

Codecov Report

Attention: 41 lines in your changes are missing coverage. Please review.

Comparison is base (727728a) 75.08% compared to head (270c492) 75.09%.
Report is 4 commits behind head on main.

Files Patch % Lines
parachain/runtime/test-common/src/lib.rs 0.00% 25 Missing ⚠️
parachain/primitives/router/src/inbound/mod.rs 50.00% 11 Missing ⚠️
parachain/pallets/system/src/api.rs 0.00% 2 Missing ⚠️
parachain/pallets/system/runtime-api/src/lib.rs 0.00% 1 Missing ⚠️
parachain/primitives/router/src/outbound/mod.rs 92.30% 1 Missing ⚠️
parachain/runtime/runtime-common/src/lib.rs 92.85% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1123      +/-   ##
==========================================
+ Coverage   75.08%   75.09%   +0.01%     
==========================================
  Files          58       58              
  Lines        2464     2461       -3     
  Branches       72       72              
==========================================
- Hits         1850     1848       -2     
+ Misses        597      596       -1     
  Partials       17       17              
Flag Coverage Δ
rust 74.02% <57.29%> (+0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Comment on lines +25 to +52
[workspace.lints.rust]
suspicious_double_ref_op = { level = "allow", priority = 2 }

[workspace.lints.clippy]
all = { level = "allow", priority = 0 }
correctness = { level = "warn", priority = 1 }
complexity = { level = "warn", priority = 1 }
if-same-then-else = { level = "allow", priority = 2 }
zero-prefixed-literal = { level = "allow", priority = 2 } # 00_1000_000
type_complexity = { level = "allow", priority = 2 } # raison d'etre
nonminimal-bool = { level = "allow", priority = 2 } # maybe
borrowed-box = { level = "allow", priority = 2 } # Reasonable to fix this one
too-many-arguments = { level = "allow", priority = 2 } # (Turning this on would lead to)
needless-lifetimes = { level = "allow", priority = 2 } # generated code
unnecessary_cast = { level = "allow", priority = 2 } # Types may change
identity-op = { level = "allow", priority = 2 } # One case where we do 0 +
useless_conversion = { level = "allow", priority = 2 } # Types may change
unit_arg = { level = "allow", priority = 2 } # stylistic
option-map-unit-fn = { level = "allow", priority = 2 } # stylistic
bind_instead_of_map = { level = "allow", priority = 2 } # stylistic
erasing_op = { level = "allow", priority = 2 } # E.g. 0 * DOLLARS
eq_op = { level = "allow", priority = 2 } # In tests we test equality.
while_immutable_condition = { level = "allow", priority = 2 } # false positives
needless_option_as_deref = { level = "allow", priority = 2 } # false positives
derivable_impls = { level = "allow", priority = 2 } # false positives
stable_sort_primitive = { level = "allow", priority = 2 } # prefer stable sort
extra-unused-type-parameters = { level = "allow", priority = 2 } # stylistic
default_constructed_unit_structs = { level = "allow", priority = 2 } # stylistic
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Same lints as the polkadot-sdk.

@claravanstaden claravanstaden marked this pull request as ready for review January 23, 2024 08:36
use sp_std::convert::From;
use xcm::v3::{prelude::*, MultiAssets, SendXcm};
use xcm_executor::Assets;
use xcm::v4::{prelude::*, SendXcm};
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Seems the explicit v4 is unnecessary here, it's by default exposed in xcm::prelude

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Good point! Changed in b8515e6

use sp_core::{H160, H256};
use sp_std::{iter::Peekable, marker::PhantomData, prelude::*};
use xcm::v3::prelude::*;
use xcm::v4::prelude::*;
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Copy link
Copy Markdown
Contributor

@yrong yrong left a comment

Choose a reason for hiding this comment

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

+1

Copy link
Copy Markdown
Collaborator

@vgeddes vgeddes left a comment

Choose a reason for hiding this comment

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

+1

@claravanstaden claravanstaden merged commit d65afb4 into main Jan 23, 2024
@claravanstaden claravanstaden deleted the update-from-upstream-22-jan branch January 23, 2024 10:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants