Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into fix/test-coverage
Browse files Browse the repository at this point in the history
* origin/master:
  Feature/homa lite periodic update (#1538)
  Fix/repatriate emit event (#1586)
  Update Dex Benchmaking (#1588)
  clear unused modules dependencies and rpc for runtimes (#1593)
  Idle schedule evm task (#1583)
  update acala genesis
  update devcontainer Dockerfile
  • Loading branch information
Roy Yang committed Nov 8, 2021
2 parents b4081f6 + 8e6d220 commit 6dedb40
Show file tree
Hide file tree
Showing 54 changed files with 14,805 additions and 14,520 deletions.
7 changes: 5 additions & 2 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,11 @@ CMD [ "sleep", "infinity" ]
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
&& apt-get -y install --no-install-recommends cmake pkg-config libssl-dev git clang libclang-dev bash-completion

USER vscode

RUN rustup default nightly-2021-06-17 && \
rustup target add wasm32-unknown-unknown --toolchain nightly-2021-06-17 \
rustup component add rustfmt
rustup target add wasm32-unknown-unknown --toolchain nightly-2021-06-17

RUN rustup component add rustfmt

RUN git config --global submodule.recurse true
44 changes: 6 additions & 38 deletions Cargo.lock

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

2 changes: 2 additions & 0 deletions modules/currencies/src/mock.rs
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,8 @@ impl module_evm::Config for Runtime {

type Runner = module_evm::runner::stack::Runner<Self>;
type FindAuthor = ();
type Task = ();
type IdleScheduler = ();
type WeightInfo = ();
}

Expand Down
2 changes: 2 additions & 0 deletions modules/evm-bridge/src/mock.rs
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,8 @@ impl module_evm::Config for Runtime {

type Runner = module_evm::runner::stack::Runner<Self>;
type FindAuthor = ();
type Task = ();
type IdleScheduler = ();
type WeightInfo = ();
}

Expand Down
2 changes: 2 additions & 0 deletions modules/evm-manager/src/mock.rs
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,8 @@ impl module_evm::Config for Runtime {

type Runner = module_evm::runner::stack::Runner<Self>;
type FindAuthor = ();
type Task = ();
type IdleScheduler = ();
type WeightInfo = ();
}

Expand Down
3 changes: 2 additions & 1 deletion modules/evm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,11 @@ module-evm-utiltity = { path = "../evm-utiltity", default-features = false }
primitives = { package = "acala-primitives", path = "../../primitives", default-features = false }

[dev-dependencies]
env_logger = "0.7"
env_logger = "0.9.0"
pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12" }
orml-currencies = { path = "../../orml/currencies" }
orml-tokens = { path = "../../orml/tokens" }
module-idle-scheduler = { path = "../idle-scheduler" }

[features]
default = ["std"]
Expand Down
Loading

0 comments on commit 6dedb40

Please sign in to comment.