parent
f58fef60fb
commit
ee6b11d36d
10
net/net.sh
10
net/net.sh
|
@ -35,7 +35,6 @@ Operate a configured testnet
|
||||||
-r / --skip-setup - Reuse existing node/ledger configuration from a
|
-r / --skip-setup - Reuse existing node/ledger configuration from a
|
||||||
previous |start| (ie, don't run ./multinode-demo/setup.sh).
|
previous |start| (ie, don't run ./multinode-demo/setup.sh).
|
||||||
-d / --debug - Build/deploy the testnet with debug binaries
|
-d / --debug - Build/deploy the testnet with debug binaries
|
||||||
-D /path/to/programs - Deploy custom programs from this location
|
|
||||||
-c clientType=numClients=extraArgs - Number of clientTypes to start. This options can be specified
|
-c clientType=numClients=extraArgs - Number of clientTypes to start. This options can be specified
|
||||||
more than once. Defaults to bench-tps for all clients if not
|
more than once. Defaults to bench-tps for all clients if not
|
||||||
specified.
|
specified.
|
||||||
|
@ -128,7 +127,6 @@ deployMethod=local
|
||||||
deployIfNewer=
|
deployIfNewer=
|
||||||
sanityExtraArgs=
|
sanityExtraArgs=
|
||||||
skipSetup=false
|
skipSetup=false
|
||||||
customPrograms=
|
|
||||||
updatePlatforms=
|
updatePlatforms=
|
||||||
nodeAddress=
|
nodeAddress=
|
||||||
numIdleClients=0
|
numIdleClients=0
|
||||||
|
@ -261,7 +259,7 @@ while [[ -n $1 ]]; do
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
while getopts "h?T:t:o:f:rD:c:Fn:i:d" opt "${shortArgs[@]}"; do
|
while getopts "h?T:t:o:f:rc:Fn:i:d" opt "${shortArgs[@]}"; do
|
||||||
case $opt in
|
case $opt in
|
||||||
h | \?)
|
h | \?)
|
||||||
usage
|
usage
|
||||||
|
@ -288,9 +286,6 @@ while getopts "h?T:t:o:f:rD:c:Fn:i:d" opt "${shortArgs[@]}"; do
|
||||||
r)
|
r)
|
||||||
skipSetup=true
|
skipSetup=true
|
||||||
;;
|
;;
|
||||||
D)
|
|
||||||
customPrograms=$OPTARG
|
|
||||||
;;
|
|
||||||
o)
|
o)
|
||||||
case $OPTARG in
|
case $OPTARG in
|
||||||
rejectExtraNodes|noInstallCheck)
|
rejectExtraNodes|noInstallCheck)
|
||||||
|
@ -429,9 +424,6 @@ build() {
|
||||||
$MAYBE_DOCKER bash -c "
|
$MAYBE_DOCKER bash -c "
|
||||||
set -ex
|
set -ex
|
||||||
scripts/cargo-install-all.sh farf \"$buildVariant\" \"$maybeUseMove\"
|
scripts/cargo-install-all.sh farf \"$buildVariant\" \"$maybeUseMove\"
|
||||||
if [[ -n \"$customPrograms\" ]]; then
|
|
||||||
scripts/cargo-install-custom-programs.sh farf $customPrograms
|
|
||||||
fi
|
|
||||||
"
|
"
|
||||||
)
|
)
|
||||||
echo "Build took $SECONDS seconds"
|
echo "Build took $SECONDS seconds"
|
||||||
|
|
|
@ -1,21 +0,0 @@
|
||||||
#!/usr/bin/env bash
|
|
||||||
#
|
|
||||||
# This script will install all cargo workspace libraries found in
|
|
||||||
# `programDir` as native programs.
|
|
||||||
set -e
|
|
||||||
|
|
||||||
# Directory to install libraries into
|
|
||||||
installDir="$(mkdir -p "$1"; cd "$1"; pwd)"
|
|
||||||
|
|
||||||
# Where to find custom programs
|
|
||||||
programDir="$2"
|
|
||||||
|
|
||||||
(
|
|
||||||
set -x
|
|
||||||
cd "$programDir"
|
|
||||||
cargo build --release
|
|
||||||
)
|
|
||||||
|
|
||||||
set -x
|
|
||||||
mkdir -p "$installDir/bin/deps"
|
|
||||||
cp -fv "$programDir"/target/release/deps/libsolana*program.* "$installDir/bin/deps"
|
|
Loading…
Reference in New Issue