Skip to content

Commit

Permalink
fix: end of life native loader (#404)
Browse files Browse the repository at this point in the history
  • Loading branch information
jstarry authored and mvines committed Jun 15, 2020
1 parent 6f05930 commit 2e3c5e7
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 114 deletions.
26 changes: 1 addition & 25 deletions web3.js/bin/localnet.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,14 @@ usage() {
echo "Error: $*"
fi
cat <<EOF
usage: $0 [update|up|down|logs|deploy] [command-specific options]
usage: $0 [update|up|down|logs] [command-specific options]
Operate a local testnet
update - Update the image from dockerhub.com
up - Start the cluster
down - Stop the cluster
logs - Display cluster logging
deploy - Deploy a native program.
logs-specific options:
Expand All @@ -49,11 +48,6 @@ Operate a local testnet
down-specific options:
none
deploy-specific options:
program - The program to deploy.
Note that deployments are discarded on cluster stop
EOF
exit $exitcode
}
Expand Down Expand Up @@ -154,24 +148,6 @@ logs)
docker logs solana-localnet
)
;;
deploy)
program=$1
[[ -n $program ]] || usage
[[ -f $program ]] || usage "file does not exist: $program"

basename=$(basename "$program")
if docker exec solana-localnet test -f /usr/bin/"$basename"; then
echo "Error: $basename has already been deployed"
exit 1
fi

(
set -x
docker cp "$program" solana-localnet:/usr/bin/
)
docker exec solana-localnet ls -l /usr/bin/"$basename"
echo "$basename deployed successfully"
;;
*)
usage "Unknown command: $cmd"
esac
Expand Down
10 changes: 0 additions & 10 deletions web3.js/module.flow.js
Original file line number Diff line number Diff line change
Expand Up @@ -306,16 +306,6 @@ declare module '@solana/web3.js' {
): Promise<PublicKey>;
}

// === src/native-loader.js ===
declare export class NativeLoader {
static programId: PublicKey;
static load(
connection: Connection,
payer: Account,
programName: string,
): Promise<PublicKey>;
}

// === src/util/send-and-confirm-transaction.js ===
declare export function sendAndConfirmTransaction(
connection: Connection,
Expand Down
1 change: 0 additions & 1 deletion web3.js/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ export {BpfLoader} from './bpf-loader';
export {BudgetProgram} from './budget-program';
export {Connection} from './connection';
export {Loader} from './loader';
export {NativeLoader} from './native-loader';
export {PublicKey} from './publickey';
export {SystemProgram} from './system-program';
export {Token, TokenAmount} from './token-program';
Expand Down
41 changes: 0 additions & 41 deletions web3.js/src/native-loader.js

This file was deleted.

37 changes: 0 additions & 37 deletions web3.js/test/native-loader.test.js

This file was deleted.

0 comments on commit 2e3c5e7

Please sign in to comment.