Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/testnet' into fix-testnet-devnet…
Browse files Browse the repository at this point in the history
…-merge-conflict
  • Loading branch information
sam0x17 committed Nov 12, 2024
2 parents 53c4f5c + ca1d908 commit 275fea2
Show file tree
Hide file tree
Showing 6 changed files with 157 additions and 58 deletions.
93 changes: 49 additions & 44 deletions Cargo.lock

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

7 changes: 6 additions & 1 deletion node/src/service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@ pub type HostFunctions = (
frame_benchmarking::benchmarking::HostFunctions,
);

pub(crate) type FullClient =
sc_service::TFullClient<Block, RuntimeApi, WasmExecutor<HostFunctions>>;
type FullBackend = sc_service::TFullBackend<Block>;
type FullSelectChain = sc_consensus::LongestChain<FullBackend, Block>;

pub type Backend = FullBackend<Block>;
pub type Client = FullClient<Block, RuntimeApi, HostFunctions>;

Expand Down Expand Up @@ -100,7 +105,7 @@ where
})
.transpose()?;

let executor = sc_service::new_wasm_executor(&config.executor);
let executor = sc_service::new_wasm_executor::<HostFunctions>(&config.executor);

let (client, backend, keystore_container, task_manager) = sc_service::new_full_parts::<B, RA, _>(
config,
Expand Down
Loading

0 comments on commit 275fea2

Please sign in to comment.