project-serum
/
anchor
mirror of https://github.com/project-serum/anchor.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ts: verbose error for missing `ANCHOR_WALLET` in `NodeWallet.local()` (#1958)

This commit is contained in:
Matthew Callens 2022-06-10 09:54:06 -04:00 committed by GitHub
parent 8f7572e8af
commit 179711bacc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -27,6 +27,7 @@ com/project-serum/anchor/pull/1841)).
* ts: Add `program.coder.types` for encoding/decoding user-defined types ([#1931](https://github.com/project-serum/anchor/pull/1931)).
* client: Add send_with_spinner_and_config function to RequestBuilder ([#1926](https://github.com/project-serum/anchor/pull/1926)).
* ts: Implement a coder for SPL associated token program ([#1939](https://github.com/project-serum/anchor/pull/1939)).
* ts: verbose error for missing `ANCHOR_WALLET` variable when using `NodeWallet.local()` ([#1958](https://github.com/project-serum/anchor/pull/1958)).
### Fixes

10
ts/src/nodewallet.ts
View File

@ -8,8 +8,15 @@ import { Wallet } from "./provider";
export default class NodeWallet implements Wallet {
constructor(readonly payer: Keypair) {}
static local(): NodeWallet {
static local(): NodeWallet | never {
const process = require("process");
if (!process.env.ANCHOR_WALLET || process.env.ANCHOR_WALLET === "") {
throw new Error(
"expected environment variable `ANCHOR_WALLET` is not set."
);
}
const payer = Keypair.fromSecretKey(
Buffer.from(
JSON.parse(
@ -19,6 +26,7 @@ export default class NodeWallet implements Wallet {
)
)
);
return new NodeWallet(payer);
}

14
ts/tests/program-common.spec.ts
View File

@ -2,6 +2,7 @@ import BN from "bn.js";
import bs58 from "bs58";
import { PublicKey } from "@solana/web3.js";
import NodeWallet from "../src/nodewallet";
import { translateAddress } from "../src/program/common";
describe("program/common", () => {
@ -53,4 +54,17 @@ describe("program/common", () => {
expect(func).toThrow();
});
});
describe("NodeWallet", () => {
it("should throw an error when ANCHOR_WALLET is unset", () => {
const oldValue = process.env.ANCHOR_WALLET;
delete process.env.ANCHOR_WALLET;
expect(() => NodeWallet.local()).toThrowError(
"expected environment variable `ANCHOR_WALLET` is not set."
);
process.env.ANCHOR_WALLET = oldValue;
});
});
});