Remove ability to deploy custom programs (#7070)

automerge
This commit is contained in:
Michael Vines 2019-11-20 16:37:42 -07:00 committed by Grimes
parent f58fef60fb
commit ee6b11d36d
2 changed files with 1 additions and 30 deletions

View File

@ -35,7 +35,6 @@ Operate a configured testnet
-r / --skip-setup - Reuse existing node/ledger configuration from a
previous |start| (ie, don't run ./multinode-demo/setup.sh).
-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
more than once. Defaults to bench-tps for all clients if not
specified.
@ -128,7 +127,6 @@ deployMethod=local
deployIfNewer=
sanityExtraArgs=
skipSetup=false
customPrograms=
updatePlatforms=
nodeAddress=
numIdleClients=0
@ -261,7 +259,7 @@ while [[ -n $1 ]]; do
fi
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
h | \?)
usage
@ -288,9 +286,6 @@ while getopts "h?T:t:o:f:rD:c:Fn:i:d" opt "${shortArgs[@]}"; do
r)
skipSetup=true
;;
D)
customPrograms=$OPTARG
;;
o)
case $OPTARG in
rejectExtraNodes|noInstallCheck)
@ -429,9 +424,6 @@ build() {
$MAYBE_DOCKER bash -c "
set -ex
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"

View File

@ -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"