Verified Commit 987e4e9b authored by Andronik Ordian's avatar Andronik Ordian
Browse files

some fixes

parent a68906d5
Pipeline #154205 canceled with stages
in 8 minutes and 29 seconds
......@@ -6,39 +6,39 @@ ARG BUILD_DATE
ARG IMAGE_NAME
LABEL io.parity.image.authors="devops-team@parity.io" \
io.parity.image.vendor="Parity Technologies" \
io.parity.image.title="${IMAGE_NAME}" \
io.parity.image.description="polkadot: a platform for web3" \
io.parity.image.source="https://github.com/paritytech/polkadot/blob/${VCS_REF}/scripts/docker/malus.Dockerfile" \
io.parity.image.revision="${VCS_REF}" \
io.parity.image.created="${BUILD_DATE}" \
io.parity.image.documentation="https://github.com/paritytech/polkadot/"
io.parity.image.vendor="Parity Technologies" \
io.parity.image.title="${IMAGE_NAME}" \
io.parity.image.description="polkadot: a platform for web3" \
io.parity.image.source="https://github.com/paritytech/polkadot/blob/${VCS_REF}/scripts/docker/malus.Dockerfile" \
io.parity.image.revision="${VCS_REF}" \
io.parity.image.created="${BUILD_DATE}" \
io.parity.image.documentation="https://github.com/paritytech/polkadot/"
# show backtraces
ENV RUST_BACKTRACE 1
# install tools and dependencies
RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y \
DEBIAN_FRONTEND=noninteractive apt-get install -y \
ca-certificates \
curl \
libssl1.1 \
tini && \
# apt cleanup
apt-get autoremove -y && \
apt-get clean && \
find /var/lib/apt/lists/ -type f -not -name lock -delete; \
# add user
groupadd --gid 10000 nonroot && \
useradd --home-dir /home/nonroot \
--create-home \
--shell /bin/bash \
--gid nonroot \
--groups nonroot \
--uid 10000 nonroot
# add adder-collator binary to docker image
apt-get autoremove -y && \
apt-get clean && \
find /var/lib/apt/lists/ -type f -not -name lock -delete; \
# add user
groupadd --gid 10000 nonroot && \
useradd --home-dir /home/nonroot \
--create-home \
--shell /bin/bash \
--gid nonroot \
--groups nonroot \
--uid 10000 nonroot
# add malus binaries to the docker image
COPY ./malus-dispute-ancestor /usr/local/bin
COPY ./malus-suggest-garbage-candidate /usr/local/bin
......
......@@ -5,22 +5,22 @@ Feature: Disputes
Then alice is up
And alice reports node_roles is 4
And alice reports sub_libp2p_is_major_syncing is 0
Then sleep 60 seconds
Then alice reports block height is greater than 10
Then sleep 15 seconds
Then alice reports block height is greater than 2
And alice reports peers count is at least 2
Then bob is up
And bob reports block height is greater than 10
And bob reports block height is greater than 2
And bob reports peers count is at least 2
Then charlie is up
And charlie reports block height is greater than 10
And charlie reports block height is greater than 2
And charlie reports peers count is at least 2
Then david is up
And alice reports parachain_candidate_open_disputes is 1
And bob reports parachain_candidate_open_disputes is 1
And charlie reports parachain_candidate_open_disputes is 1
Then alice parachain_candidate_dispute_votes is at least 1
And bob parachain_candidate_dispute_votes is is at least 2
And charlie parachain_candidate_dispute_votes is at least 3
Then alice parachain_candidate_dispute_concluded is "valid"
And bob parachain_candidate_dispute_concluded is "valid"
And charlie parachain_candidate_dispute_concluded is "valid"
And alice reports polkadot_parachain_candidate_open_disputes is 1
And bob reports polkadot_parachain_candidate_open_disputes is 1
And charlie reports polkadot_parachain_candidate_open_disputes is 1
Then alice polkadot_parachain_candidate_dispute_votes is at least 1
And bob polkadot_parachain_candidate_dispute_votes is is at least 2
And charlie polkadot_parachain_candidate_dispute_votes is at least 3
Then alice polkadot_parachain_candidate_dispute_concluded is "valid"
And bob polkadot_parachain_candidate_dispute_concluded is "valid"
And charlie polkadot_parachain_candidate_dispute_concluded is "valid"
......@@ -5,23 +5,23 @@ Feature: Disputes
Then alice is up
And alice reports node_roles is 4
And alice reports sub_libp2p_is_major_syncing is 0
Then sleep 60 seconds
Then alice reports block height is greater than 10
Then sleep 15 seconds
Then alice reports block height is greater than 2
And alice reports peers count is at least 2
Then bob is up
And bob reports block height is greater than 10
And bob reports block height is greater than 2
And bob reports peers count is at least 2
Then charlie is up
And charlie reports block height is greater than 10
And charlie reports block height is greater than 2
And charlie reports peers count is at least 2
Then david is up
Then eve is up
And alice reports parachain_candidate_open_disputes is 1
And bob reports parachain_candidate_open_disputes is 1
And charlie reports parachain_candidate_open_disputes is 1
Then alice parachain_candidate_dispute_votes is at least 1
And bob parachain_candidate_dispute_votes is is at least 2
And charlie parachain_candidate_dispute_votes is at least 3
Then alice parachain_candidate_dispute_concluded is "valid"
And bob parachain_candidate_dispute_concluded is "valid"
And charlie parachain_candidate_dispute_concluded is "valid"
And alice reports polkadot_parachain_candidate_open_disputes is 1
And bob reports polkadot_parachain_candidate_open_disputes is 1
And charlie reports polkadot_parachain_candidate_open_disputes is 1
Then alice polkadot_parachain_candidate_dispute_votes is at least 1
And bob polkadot_parachain_candidate_dispute_votes is is at least 2
And charlie polkadot_parachain_candidate_dispute_votes is at least 3
Then alice polkadot_parachain_candidate_dispute_concluded is "valid"
And bob polkadot_parachain_candidate_dispute_concluded is "valid"
And charlie polkadot_parachain_candidate_dispute_concluded is "valid"
[settings.defaults]
image = "parity/polkadot"
image = "{{get_env(name="SYNTHIMAGE") | safe }}"
command = "polkadot"
chain-name = "polkadot-local"
timeout = 1000
......@@ -7,29 +7,29 @@ timeout = 1000
[nodes.alice]
validator = true
extra-args = ["--alice"]
image = "parity/polkadot"
image = "{{get_env(name="SYNTHIMAGE") | safe }}"
command = "polkadot"
[nodes.bob]
validator = true
extra-args = ["--bob"]
image = "parity/polkadot"
command = "/usr/local/bin/malus-back-garbage-block"
image = "{{get_env(name="MALUSIMAGE") | safe }}"
command = "/usr/local/bin/malus-back-garbage-candidate"
[nodes.charlie]
validator = true
extra-args = ["--charlie"]
image = "parity/polkadot"
command = "/usr/local/bin/malus-back-garbage-block"
image = "{{get_env(name="MALUSIMAGE") | safe }}"
command = "/usr/local/bin/malus-back-garbage-candidate"
[nodes.david]
validator = true
extra-args = ["--dave"]
image = "paritypr/malus"
command = "/usr/local/bin/malus-back-garbage-block"
image = "{{get_env(name="MALUSIMAGE") | safe }}"
command = "/usr/local/bin/malus-back-garbage-candidate"
[nodes.eve]
validator = true
extra-args = ["--eve"]
image = "paritypr/malus"
command = "/usr/local/bin/malus-suggest-garbage-block"
image = "{{get_env(name="MALUSIMAGE") | safe }}"
command = "/usr/local/bin/malus-suggest-garbage-candidate"
......@@ -107,10 +107,6 @@ where
msg: FromOverseer<Self::Message>,
) -> Option<FromOverseer<Self::Message>> {
match msg {
// FromOverseer::Communication {
// msg:
// DisputeCoordinatorMessage::
// }
FromOverseer::Communication {
msg:
CandidateValidationMessage::ValidateFromExhaustive(
......
......@@ -85,7 +85,6 @@ where
.unbounded_send((sender.clone(), hash, candidate_receipt.clone()))
.unwrap();
// TODO not sure if this is necessary or not
Some(FromOverseer::Communication {
msg: CandidateBackingMessage::Second(
hash,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment