Skip to content
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
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: 1 addition & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,6 @@ jobs:
--package node-rpc-runtime-api
--package pallet-transaction-payment
--package polymesh-runtime-tests
--package pallet-balances:0.1.0
--package asset-metadata
no_output_timeout: 30m
- save-sccache-cache
Expand Down Expand Up @@ -472,7 +471,7 @@ jobs:
working_directory: ./integration
- run:
name: Run polymesh-api integration tests against the previous version.
command: cargo nextest run --features previous_release --locked
command: cargo nextest run --features current_release --locked
working_directory: ./integration
no_output_timeout: 30m
- run:
Expand Down
311 changes: 143 additions & 168 deletions Cargo.lock

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ substrate-test-utils = { git = "https://github.com/PolymeshAssociation/polkadot-
members = [
"node-rpc",
"pallets/asset",
"pallets/balances",
"pallets/base",
"pallets/committee",
"pallets/compliance-manager",
Expand Down Expand Up @@ -156,7 +155,6 @@ exclude = [
[workspace.dependencies]
# Our pallets
pallet-asset = { path = "pallets/asset", default-features = false }
pallet-balances = { path = "pallets/balances", default-features = false }
pallet-base = { path = "pallets/base", default-features = false }
pallet-committee = { path = "pallets/committee", default-features = false }
pallet-compliance-manager = { path = "pallets/compliance-manager", default-features = false }
Expand Down Expand Up @@ -213,6 +211,7 @@ frame-system-rpc-runtime-api = { version = "4.0.0-dev", default-features = false
pallet-authority-discovery = { version = "4.0.0-dev", default-features = false }
pallet-authorship = { version = "4.0.0-dev", default-features = false }
pallet-babe = { version = "4.0.0-dev", default-features = false }
pallet-balances = { version = "4.0.0-dev", default-features = false }
pallet-contracts = { version = "4.0.0-dev", default-features = false }
pallet-contracts-primitives = { version = "7.0.0", default-features = false}
pallet-election-provider-multi-phase = { version = "4.0.0-dev", default-features = false }
Expand Down
21 changes: 7 additions & 14 deletions integration/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions integration/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ sp-keyring = "41.0"
sp-weights = "31.1"
codec = { package = "parity-scale-codec", version = "3.0.0", features = ["derive", "max-encoded-len"] }

polymesh-api = { version = "3.11.0", features = ["download_metadata"] }
polymesh-api-client-extras = { version = "3.6.0" }
polymesh-api-tester = { version = "0.10.0", features = ["download_metadata"] }
polymesh-api = { git = "https://github.com/PolymeshAssociation/polymesh-api", branch = "update-new-type", features = ["download_metadata", "polymesh_v8"] }
polymesh-api-client-extras = { git = "https://github.com/PolymeshAssociation/polymesh-api", branch = "update-new-type", features = ["polymesh_v8"]}
polymesh-api-tester = { git = "https://github.com/PolymeshAssociation/polymesh-api", branch = "update-new-type", features = ["download_metadata"] }
6 changes: 5 additions & 1 deletion integration/src/sto.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,11 @@ pub async fn get_fundraiser_id(
if let Some(events) = res.events().await? {
for rec in &events.0 {
match &rec.event {
RuntimeEvent::Sto(StoEvent::FundraiserCreated { offering_asset, fundraiser_id, .. }) => {
RuntimeEvent::Sto(StoEvent::FundraiserCreated {
offering_asset,
fundraiser_id,
..
}) => {
return Ok(Some((*offering_asset, fundraiser_id.clone())));
}
_ => (),
Expand Down
8 changes: 6 additions & 2 deletions integration/tests/multisig_permissions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ use anyhow::{anyhow, Result};
use polymesh_api::{
types::polymesh_primitives::{
authorization::AuthorizationData,
identity_id::PortfolioName,
secondary_key::Signatory,
settlement::{VenueDetails, VenueType},
identity_id::PortfolioName,
},
TransactionResults, WrappedCall,
};
Expand Down Expand Up @@ -612,7 +612,11 @@ async fn ms_needs_to_be_linked_to_an_identity() -> Result<()> {
res.wait_in_block().await?;

// Prepare `create_portfolio` call.
let call = tester.api.call().portfolio().create_portfolio(PortfolioName(Vec::new()))?;
let call = tester
.api
.call()
.portfolio()
.create_portfolio(PortfolioName(Vec::new()))?;
// Shouldn't be allowed, since the MS doesn't have a DID.
let res = ms.run_proposal(call).await;
assert!(res.is_err());
Expand Down
62 changes: 0 additions & 62 deletions pallets/balances/Cargo.toml

This file was deleted.

91 changes: 0 additions & 91 deletions pallets/balances/src/benchmarking.rs

This file was deleted.

Loading