Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
pgherveou committed Jan 15, 2024
1 parent 7473004 commit dbbfb09
Show file tree
Hide file tree
Showing 12 changed files with 157 additions and 12 deletions.
149 changes: 149 additions & 0 deletions Cargo.lock

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

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ serde_json = "1.0.111"
scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
smallvec = "1.11.2"
color-print = "0.3.5"
wasmtime="8.0.1"

# Substrate
frame-benchmarking = { version = "27.0.0", default-features = false }
Expand Down
1 change: 1 addition & 0 deletions node/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ serde = { workspace = true }
jsonrpsee = { workspace = true }
futures = { workspace = true }
serde_json = { workspace = true }
wasmtime = { workspace = true }

# Local
contracts-parachain-runtime = { path = "../parachain-runtime", version = "0.35.0" }
Expand Down
1 change: 0 additions & 1 deletion node/src/chain_spec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -151,4 +151,3 @@ fn testnet_genesis(
"sudo": { "key": Some(root) }
})
}

1 change: 0 additions & 1 deletion node/src/chain_spec/dev.rs
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,3 @@ fn testnet_genesis(
},
})
}

1 change: 0 additions & 1 deletion node/src/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -114,4 +114,3 @@ impl RelayChainCli {
}
}
}

2 changes: 0 additions & 2 deletions node/src/command.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ use sc_service::config::{BasePath, PrometheusConfig};
use sp_runtime::traits::AccountIdConversion;
use std::net::SocketAddr;


fn load_spec(id: &str) -> std::result::Result<Box<dyn ChainSpec>, String> {
Ok(match id {
"" | "dev" => Box::new(chain_spec::dev::development_config().unwrap()),
Expand Down Expand Up @@ -398,4 +397,3 @@ impl CliConfiguration<Self> for RelayChainCli {
self.base.base.node_name()
}
}

3 changes: 1 addition & 2 deletions node/src/rpc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use std::sync::Arc;

use contracts_parachain_runtime::{opaque::Block, AccountId, Balance, Nonce};

pub use sc_rpc::{DenyUnsafe, };
pub use sc_rpc::DenyUnsafe;
use sc_transaction_pool_api::TransactionPool;
use sp_api::ProvideRuntimeApi;
use sp_block_builder::BlockBuilder;
Expand Down Expand Up @@ -54,4 +54,3 @@ where
module.merge(TransactionPayment::new(client).into_rpc())?;
Ok(module)
}

1 change: 0 additions & 1 deletion node/src/service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -438,4 +438,3 @@ pub async fn start_parachain_node(
) -> sc_service::error::Result<(TaskManager, Arc<ParachainClient>)> {
start_node_impl(parachain_config, polkadot_config, collator_options, para_id, hwbench).await
}

2 changes: 1 addition & 1 deletion node/src/service/dev.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
use contracts_node_runtime::{self, opaque::Block, RuntimeApi};
use futures::FutureExt;
use sc_client_api::{Backend};
use sc_client_api::Backend;
pub use sc_executor::NativeElseWasmExecutor;
use sc_service::{error::Error as ServiceError, Configuration, TaskManager};
use sc_telemetry::{Telemetry, TelemetryWorker};
Expand Down
1 change: 0 additions & 1 deletion parachain-runtime/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -849,4 +849,3 @@ cumulus_pallet_parachain_system::register_validate_block! {
Runtime = Runtime,
BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::<Runtime, Executive>,
}

6 changes: 4 additions & 2 deletions runtime/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@ include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
mod assets_config;
mod contracts_config;

use frame_support::dispatch::DispatchClass;
use frame_support::{
dispatch::DispatchClass,
genesis_builder_helper::{build_config, create_default_config},
};
use frame_system::limits::{BlockLength, BlockWeights};
use polkadot_runtime_common::SlowAdjustingFeeUpdate;
use sp_api::impl_runtime_apis;
Expand All @@ -24,7 +27,6 @@ use sp_std::prelude::*;
#[cfg(feature = "std")]
use sp_version::NativeVersion;
use sp_version::RuntimeVersion;
use frame_support::genesis_builder_helper::{build_config, create_default_config};

// A few exports that help ease life for downstream crates.
pub use frame_support::{
Expand Down

0 comments on commit dbbfb09

Please sign in to comment.