build: remove unused programs

Remove ddconfig.sh, tealcut, commandandcontrol (cc_agent, cc_client, cc_service)
Stop packaging carpenter, catchupsrv, doberman

Author: cce

Makefile

@@ -301,7 +301,7 @@ build-e2e: check-go-version crypto/libs/$(OS_TYPE)/$(ARCH)/lib/libsodium.a
 	wait
 	cp $(GOBIN)/kmd $(GOBIN)-race
 
-NONGO_BIN_FILES=$(GOBIN)/find-nodes.sh $(GOBIN)/update.sh $(GOBIN)/COPYING $(GOBIN)/ddconfig.sh
+NONGO_BIN_FILES=$(GOBIN)/find-nodes.sh $(GOBIN)/update.sh $(GOBIN)/COPYING
 
 NONGO_BIN: $(NONGO_BIN_FILES)
 
@@ -311,8 +311,6 @@ $(GOBIN)/update.sh: cmd/updater/update.sh
 
 $(GOBIN)/COPYING: COPYING
 
-$(GOBIN)/ddconfig.sh: scripts/ddconfig.sh
-
 $(GOBIN)/%:
 	cp -f $< $@
 

README.md

@@ -135,7 +135,6 @@ Contains the two daemons that provide Algorand clients with services:
 Enables developers to interface with the Algorand system:
 
 - **cmd**: Contains the primary commands defining entry points into the system.
-  - **cmd/catchupsrv** ([README](cmd/catchupsrv/README.md)): A tool to assist with processing historic blocks on a new node.
 - **libgoal**: Exports a Go interface useful for developers of Algorand clients.
 - **tools** ([README](tools/README.md)): Various tools and utilities that don’t have a better place to go.
 - **tools/debug**: Holds secondary commands that assist developers during debugging.
@@ -147,8 +146,6 @@ Helps Algorand developers deploy networks of their own:
 
 - **nodecontrol**
 - **docker**
-- **commandandcontrol** ([README](test/commandandcontrol/README.md)): A tool to automate a network of `algod` instances.
-- **components**
 - **netdeploy**
 
 ### Utilities

cmd/updater/update.sh

@@ -492,7 +492,7 @@ function run_systemd_action() {
 function backup_binaries() {
     echo "Backing up current binary files..."
     mkdir -p "${BINDIR}/backup"
-    BACKUPFILES="algod kmd carpenter doberman goal update.sh updater diagcfg"
+    BACKUPFILES="algod kmd goal update.sh updater diagcfg"
     # add node_exporter to the files list we're going to backup, but only we if had it previously deployed.
     [ -f "${BINDIR}/node_exporter" ] && BACKUPFILES="${BACKUPFILES} node_exporter"
     # If we have algotmpl, we should back it up too
@@ -691,6 +691,16 @@ function apply_fixups() {
     # Delete obsolete algorand binary - renamed to 'goal'
     rm "${BINDIR}/algorand" >/dev/null 2>&1
 
+    # Delete obsolete binaries removed in go-algorand
+    rm "${BINDIR}/carpenter" >/dev/null 2>&1
+    rm "${BINDIR}/catchupsrv" >/dev/null 2>&1
+    rm "${BINDIR}/doberman" >/dev/null 2>&1
+    rm "${BINDIR}/ddconfig.sh" >/dev/null 2>&1
+    rm "${BINDIR}/tealcut" >/dev/null 2>&1
+    rm "${BINDIR}/cc_service" >/dev/null 2>&1
+    rm "${BINDIR}/cc_agent" >/dev/null 2>&1
+    rm "${BINDIR}/cc_client" >/dev/null 2>&1
+
     for DD in ${DATADIRS[@]}; do
         clean_legacy_logs "${DD}"
 

installer/rpm/algorand-devtools/algorand-devtools.spec

@@ -26,7 +26,7 @@ This package provides development tools for the Algorand blockchain.
 mkdir -p %{buildroot}/usr/bin
 # NOTE: keep in sync with scripts/build_deb.sh bin_files
 # NOTE: keep in sync with %files section below
-for f in carpenter catchupsrv msgpacktool tealcut tealdbg; do
+for f in carpenter msgpacktool tealdbg; do
   install -m 755 ${ALGO_BIN}/${f} %{buildroot}/usr/bin/${f}
 done
 
@@ -38,9 +38,7 @@ install -m 644 ${REPO_DIR}/installer/rpm/algorand-devtools/algorand-devtools.rep
 
 %files
 /usr/bin/carpenter
-/usr/bin/catchupsrv
 /usr/bin/msgpacktool
-/usr/bin/tealcut
 /usr/bin/tealdbg
 /etc/pki/rpm-gpg/RPM-GPG-KEY-Algorand
 /usr/lib/algorand/yum.repos.d/algorand-devtools.repo

installer/rpm/algorand/algorand.spec

@@ -29,7 +29,7 @@ This package provides an implementation of the Algorand protocol.
 mkdir -p %{buildroot}/usr/bin
 # NOTE: keep in sync with scripts/build_deb.sh bin_files
 # NOTE: keep in sync with %files section below
-for f in algocfg algod algoh algokey ddconfig.sh diagcfg goal kmd node_exporter; do
+for f in algocfg algod algoh algokey diagcfg goal kmd node_exporter; do
   install -m 755 ${ALGO_BIN}/${f} %{buildroot}/usr/bin/${f}
 done
 
@@ -77,7 +77,6 @@ fi
 /usr/bin/algod
 /usr/bin/algoh
 /usr/bin/algokey
-/usr/bin/ddconfig.sh
 /usr/bin/diagcfg
 /usr/bin/goal
 /usr/bin/kmd

scripts/build_deb.sh

@@ -52,7 +52,7 @@ mkdir -p "${PKG_ROOT}/usr/bin"
 
 if [ "${VARIATION}" = "" ]; then
     # NOTE: keep in sync with installer/rpm/algorand.spec
-    bin_files=("algocfg" "algod" "algoh" "algokey" "carpenter" "catchupsrv" "ddconfig.sh" "diagcfg" "goal" "kmd" "msgpacktool" "node_exporter" "tealcut" "tealdbg")
+    bin_files=("algocfg" "algod" "algoh" "algokey" "carpenter" "diagcfg" "goal" "kmd" "msgpacktool" "node_exporter" "tealdbg")
 fi
 
 for bin in "${bin_files[@]}"; do

scripts/build_package.sh

@@ -77,7 +77,7 @@ DEFAULT_RELEASE_NETWORK=$(./scripts/compute_branch_release_network.sh "${DEFAULT
 mkdir ${PKG_ROOT}/bin
 
 # If you modify this list, also update this list in ./cmd/updater/update.sh backup_binaries()
-bin_files=("algocfg" "algotmpl" "algod" "algoh" "algokey" "carpenter" "catchupsrv" "ddconfig.sh" "diagcfg" "find-nodes.sh" "goal" "kmd" "msgpacktool" "node_exporter" "tealcut" "tealdbg" "update.sh" "updater" "COPYING")
+bin_files=("algocfg" "algotmpl" "algod" "algoh" "algokey" "diagcfg" "find-nodes.sh" "goal" "kmd" "msgpacktool" "node_exporter" "tealdbg" "update.sh" "updater" "COPYING")
 for bin in "${bin_files[@]}"; do
     cp ${GOBIN}/${bin} ${PKG_ROOT}/bin
     if [ $? -ne 0 ]; then exit 1; fi
@@ -120,7 +120,7 @@ TOOLS_ROOT=${PKG_ROOT}/tools
 
 echo "Staging tools package files"
 
-bin_files=("algons" "coroner" "dispenser" "netgoal" "nodecfg" "pingpong" "cc_service" "cc_agent" "cc_client" "loadgenerator" "COPYING" "dsign" "catchpointdump" "block-generator")
+bin_files=("algons" "carpenter" "coroner" "dispenser" "netgoal" "nodecfg" "pingpong" "loadgenerator" "COPYING" "dsign" "catchpointdump" "block-generator")
 mkdir -p ${TOOLS_ROOT}
 for bin in "${bin_files[@]}"; do
     cp ${GOBIN}/${bin} ${TOOLS_ROOT}
@@ -140,4 +140,4 @@ cp "scripts/sysctl.sh" ${TOOLS_ROOT}
 if [ $? -ne 0 ]; then exit 1; fi
 
 cp "scripts/sysctl-all.sh" ${TOOLS_ROOT}
-if [ $? -ne 0 ]; then exit 1; fi
+if [ $? -ne 0 ]; then exit 1; fi

scripts/ddconfig.sh

@@ -28,12 +28,12 @@ mkdir -p "$PKG_ROOT/usr/bin"
 
 # NOTE: keep in sync with `./installer/rpm/algorand.spec`.
 if [[ "$PKG_NAME" =~ devtools ]]; then
-    BIN_FILES=("carpenter" "catchupsrv" "msgpacktool" "tealcut" "tealdbg")
+    BIN_FILES=("carpenter" "msgpacktool" "tealdbg")
     UNATTENDED_UPGRADES_FILE="53algorand-devtools-upgrades"
     OUTPUT_DEB="$OUTDIR/algorand-devtools_${CHANNEL}_${OS_TYPE}-${ARCH}_${VER}.deb"
     REQUIRED_ALGORAND_PKG=$("./scripts/compute_package_name.sh" "$CHANNEL")
 else
-    BIN_FILES=("algocfg" "algod" "algoh" "algokey" "ddconfig.sh" "diagcfg" "goal" "kmd" "node_exporter")
+    BIN_FILES=("algocfg" "algod" "algoh" "algokey" "diagcfg" "goal" "kmd" "node_exporter")
     OUTPUT_DEB="$OUTDIR/algorand_${CHANNEL}_${OS_TYPE}-${ARCH}_${VER}.deb"
     UNATTENDED_UPGRADES_FILE="51algorand-upgrades"
 fi

scripts/release/build/deb/build_deb.sh

@@ -34,12 +34,12 @@ find tmp/node_pkgs -name "*${CHANNEL}*linux*${VERSION}*.tar.gz" | cut -d '/' -f3
 
     # NOTE: keep in sync with `./installer/rpm/algorand.spec`.
     if [[ "$ALGORAND_PACKAGE_NAME" =~ devtools ]]; then
-        BIN_FILES=("carpenter" "catchupsrv" "msgpacktool" "tealcut" "tealdbg")
+        BIN_FILES=("carpenter" "msgpacktool" "tealdbg")
         UNATTENDED_UPGRADES_FILE="53algorand-devtools-upgrades"
         OUTPUT_DEB="$PKG_DIR/algorand-devtools_${CHANNEL}_${OS_TYPE}-${ARCH}_${VERSION}.deb"
         REQUIRED_ALGORAND_PKG=$("./scripts/compute_package_name.sh" "$CHANNEL")
     else
-        BIN_FILES=("algocfg" "algod" "algoh" "algokey" "ddconfig.sh" "diagcfg" "goal" "kmd" "node_exporter")
+        BIN_FILES=("algocfg" "algod" "algoh" "algokey" "diagcfg" "goal" "kmd" "node_exporter")
         UNATTENDED_UPGRADES_FILE="51algorand-upgrades"
         OUTPUT_DEB="$PKG_DIR/algorand_${CHANNEL}_${OS_TYPE}-${ARCH}_${VERSION}.deb"
     fi