Rename the coins folder to networks (#583)

* Rename the coins folder to networks

Ethereum isn't a coin. It's a network.

Resolves #357.

* More renames of coins -> networks in orchestration

* Correct paths in tests/

* cargo fmt
This commit is contained in:
Luke Parker
2024-07-18 12:16:45 -07:00
committed by GitHub
parent 40cc180853
commit 7d2d739042
244 changed files with 102 additions and 99 deletions

View File

@@ -19,7 +19,7 @@ FROM deterministic
ADD patches /serai/patches
ADD common /serai/common
ADD crypto /serai/crypto
ADD coins /serai/coins
ADD networks /serai/networks
ADD message-queue /serai/message-queue
ADD processor /serai/processor
ADD coordinator /serai/coordinator

View File

@@ -15,7 +15,7 @@ pub fn build(orchestration_path: &Path, network: Network, name: &str) {
let mut dockerfile_path = orchestration_path.to_path_buf();
if HashSet::from(["bitcoin", "ethereum", "monero", "monero-wallet-rpc"]).contains(name) {
dockerfile_path = dockerfile_path.join("coins");
dockerfile_path = dockerfile_path.join("networks");
}
if name.contains("-processor") {
dockerfile_path =

View File

@@ -31,7 +31,7 @@ CMD {env_vars_str} serai-ethereum-relayer
let res = setup + &run;
let mut ethereum_relayer_path = orchestration_path.to_path_buf();
ethereum_relayer_path.push("coins");
ethereum_relayer_path.push("networks");
ethereum_relayer_path.push("ethereum-relayer");
ethereum_relayer_path.push("Dockerfile");

View File

@@ -29,8 +29,8 @@ use ciphersuite::{
mod mimalloc;
use mimalloc::mimalloc;
mod coins;
use coins::*;
mod networks;
use networks::*;
mod ethereum_relayer;
use ethereum_relayer::ethereum_relayer;
@@ -168,7 +168,7 @@ RUN rustup target add wasm32-unknown-unknown
ADD patches /serai/patches
ADD common /serai/common
ADD crypto /serai/crypto
ADD coins /serai/coins
ADD networks /serai/networks
ADD message-queue /serai/message-queue
ADD processor /serai/processor
ADD coordinator /serai/coordinator

View File

@@ -37,7 +37,7 @@ COPY --from=bitcoin --chown=bitcoin bitcoind /bin
EXPOSE 8332 8333
ADD /orchestration/{}/coins/bitcoin/run.sh /
ADD /orchestration/{}/networks/bitcoin/run.sh /
CMD ["/run.sh"]
"#,
network.label()
@@ -47,7 +47,7 @@ CMD ["/run.sh"]
let res = setup + &run;
let mut bitcoin_path = orchestration_path.to_path_buf();
bitcoin_path.push("coins");
bitcoin_path.push("networks");
bitcoin_path.push("bitcoin");
bitcoin_path.push("Dockerfile");

View File

@@ -27,7 +27,7 @@ RUN tar xvf lighthouse-v${LIGHTHOUSE_VERSION}-$(uname -m)-unknown-linux-gnu.tar.
r#"
COPY --from=lighthouse --chown=ethereum lighthouse /bin
ADD /orchestration/{}/coins/ethereum/consensus/lighthouse/run.sh /consensus_layer.sh
ADD /orchestration/{}/networks/ethereum/consensus/lighthouse/run.sh /consensus_layer.sh
"#,
network.label()
);

View File

@@ -40,7 +40,7 @@ RUN sha512sum nimbus | grep {checksum}
r#"
COPY --from=nimbus --chown=ethereum nimbus /bin
ADD /orchestration/{}/coins/ethereum/consensus/nimbus/run.sh /consensus_layer.sh
ADD /orchestration/{}/networks/ethereum/consensus/nimbus/run.sh /consensus_layer.sh
"#,
network.label()
);

View File

@@ -29,7 +29,7 @@ COPY --from=reth --chown=ethereum reth /bin
EXPOSE 30303 9001 8545
ADD /orchestration/{}/coins/ethereum/execution/reth/run.sh /execution_layer.sh
ADD /orchestration/{}/networks/ethereum/execution/reth/run.sh /execution_layer.sh
"#,
network.label()
);

View File

@@ -21,7 +21,7 @@ pub fn ethereum(orchestration_path: &Path, network: Network) {
let run = format!(
r#"
ADD /orchestration/{}/coins/ethereum/run.sh /run.sh
ADD /orchestration/{}/networks/ethereum/run.sh /run.sh
CMD ["/run.sh"]
"#,
network.label()
@@ -35,7 +35,7 @@ CMD ["/run.sh"]
let res = download + &run;
let mut ethereum_path = orchestration_path.to_path_buf();
ethereum_path.push("coins");
ethereum_path.push("networks");
ethereum_path.push("ethereum");
ethereum_path.push("Dockerfile");

View File

@@ -30,7 +30,7 @@ RUN apk --no-cache add gnupg
RUN wget https://downloads.getmonero.org/cli/monero-linux-{arch}-v{MONERO_VERSION}.tar.bz2
# Verify Binary -- fingerprint from https://github.com/monero-project/monero-site/issues/1949
ADD orchestration/{}/coins/monero/hashes-v{MONERO_VERSION}.txt .
ADD orchestration/{}/networks/monero/hashes-v{MONERO_VERSION}.txt .
RUN gpg --keyserver hkp://keyserver.ubuntu.com:80 --keyserver-options no-self-sigs-only --receive-keys 81AC591FE9C4B65C5806AFC3F0AF4D462A0BDF92 && \
gpg --verify hashes-v{MONERO_VERSION}.txt && \
grep "$(sha256sum monero-linux-{arch}-v{MONERO_VERSION}.tar.bz2 | cut -c 1-64)" hashes-v{MONERO_VERSION}.txt
@@ -49,7 +49,7 @@ COPY --from=monero --chown=monero:nogroup {monero_binary} /bin
EXPOSE {ports}
ADD /orchestration/{}/coins/{folder}/run.sh /
ADD /orchestration/{}/networks/{folder}/run.sh /
CMD ["/run.sh"]
"#,
network.label(),
@@ -61,7 +61,7 @@ CMD ["/run.sh"]
let res = setup + &run;
let mut monero_path = orchestration_path.to_path_buf();
monero_path.push("coins");
monero_path.push("networks");
monero_path.push(folder);
monero_path.push("Dockerfile");