[dev] Improve setup script (#77)

Author: guibescos

README.md

@@ -21,6 +21,13 @@ First, install both the [Solana CLI tools](https://docs.solana.com/cli/install-s
 
 Install [Docker](https://docs.docker.com/engine/install/).
 
+Install jq and gsed.
+
+```bash
+brew install gnu-sed
+brew install jq
+```
+
 ### Web Frontend
 
 The frontend depends on a postgres database for storing claims and on an instance of Solana to send on-chain transactions.

frontend/integration/integrationTest.test.ts

@@ -116,16 +116,6 @@ describe('integration test', () => {
     let mint: Token
     let treasury: PublicKey
     beforeAll(async () => {
-      await airdrop(
-        tokenDispenserProvider.connection,
-        LAMPORTS_PER_SOL,
-        tokenDispenserProvider.claimant
-      )
-      const walletBalance = await tokenDispenserProvider.connection.getBalance(
-        wallet.publicKey
-      )
-      expect(walletBalance).toEqual(LAMPORTS_PER_SOL)
-
       const mintAndTreasury =
         await tokenDispenserProvider.setupMintAndTreasury()
       mint = mintAndTreasury.mint

frontend/scripts/setup.sh

@@ -14,8 +14,6 @@ TOKEN_DISPENSER_DIR="$DIR/../../token-dispenser";
 TOKEN_DISPENSER_PID=Fg6PaFpoGXkYsidMpWTK6W2BeZ7FEfcYkg476zPFsLnS
 TOKEN_DISPENSER_SO="$TOKEN_DISPENSER_DIR/target/deploy/token_dispenser.so"
 
-VALIDATOR_PID=
-
 usage() {
   cat <<EOF
   Usage: $0 -d[--dev]|-t[--test] -v[--verbose] --no-postgres -h[--help]
@@ -109,38 +107,21 @@ function populate() {
   npm run populate;
 }
 
+function build_program() {
+  cd "$TOKEN_DISPENSER_DIR";
+  anchor run export;
+}
+
 function run_integration_tests() {
   cd "$DIR";
   npm run test;
 }
 
-
-function start_test_validator() {
-  cd "$TOKEN_DISPENSER_DIR";
-  anchor run export;
-  solana-test-validator -r \
-    --bpf-program "$TOKEN_DISPENSER_PID" "$TOKEN_DISPENSER_SO" \
-    --quiet \
-    &
-  VALIDATOR_PID=$!
-  sleep 5
-}
-
 function start_anchor_localnet() {
   cd "$TOKEN_DISPENSER_DIR";
-  anchor run export;
   anchor localnet;
 }
 
-
-function stop_test_validator() {
-  set +e
-  [ -z $VALIDATOR_PID ] || (
-      kill $VALIDATOR_PID
-  )
-  return 0
-}
-
 function stop_anchor_localnet() {
   solana_pid=$(pgrep -f '[s]olana-test-validator' || true)
   if [ -n "$solana_pid" ]; then
@@ -162,23 +143,23 @@ function cleanup() {
       echo "shutting down solana-test-validator if running"
   fi
   stop_anchor_localnet;
-  stop_test_validator;
-
 }
 
 function main() {
   # run clean up in case of failures from previous run
   cleanup;
   # setup postgres docker
   setup_postgres_docker;
+  # start solana-test-validator
+  build_program;
+  start_anchor_localnet &
+  sleep 5
   if [ "$dev" -eq 1 ]; then
       if [ "$verbose" -eq 1 ]; then
         echo "dev mode"
-        echo "populate db and deploy solana-test-validator using anchor localnet"
+        echo "populate db and deploy and initialize program"
       fi
       printf "\n\n**Running solana-test-validator until CTRL+C detected**\n\n"
-      start_anchor_localnet &
-      sleep 5
       populate;
       # wait for ctrl-c
       ( trap exit SIGINT ; read -r -d '' _ </dev/tty )
@@ -187,8 +168,6 @@ function main() {
         echo "test mode"
         echo "running frontend tests"
       fi
-      start_test_validator
-      sleep 5
       run_integration_tests;
   else
       echo "no mode selected"

token-dispenser/Anchor.toml

@@ -9,7 +9,7 @@ url = "https://api.apr.dev"
 
 [provider]
 cluster = "Localnet"
-wallet = "~/.config/solana/id.json"
+wallet = "../frontend/integration/keys/solana_private_key.json"
 
 [scripts]
 test = "cargo test-bpf"

token-dispenser/scripts/export_idl.sh

@@ -24,11 +24,7 @@ generate_declaration_file() {
 
     prog="$(basename $PROGRAM_SO .json)"
     OUT_PATH="$OUT_DIR/$prog.ts"
-    if [ ! $(which gsed) ]; then
-        PREFIX=$(echo $prog | sed -E 's/(^|_)([a-z])/\U\2/g')
-    else
-        PREFIX=$(echo $prog | gsed -E 's/(^|_)([a-z])/\U\2/g')
-    fi
+    PREFIX=$(echo $prog | gsed -E 's/(^|_)([a-z])/\U\2/g')
     typename="${PREFIX}"
 
     # types