-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ts: fix translateAddress should not rely on PublicKey constructor name
Since anchor is used in web projects which will minify/mangle function names, checking an input object for a custom constructor name is unsafe. Moreover, checking the type of the input Address is unnecessary since `PublicKey`'s constructor handles: - `string` - `array` - object with a `{ _bn }` shape (like `PublicKey` itself)
- Loading branch information
1 parent
fcb07eb
commit 7712004
Showing
2 changed files
with
57 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,56 @@ | ||
import BN from "bn.js"; | ||
import bs58 from "bs58"; | ||
import { PublicKey } from "@solana/web3.js"; | ||
|
||
import { translateAddress } from "../src/program/common"; | ||
|
||
describe("program/common", () => { | ||
describe("translateAddress", () => { | ||
it("should accept a valid string address", () => { | ||
const address = "11111111111111111111111111111111"; | ||
|
||
const func = () => translateAddress(address); | ||
expect(func).not.toThrow(); | ||
|
||
const output = func(); | ||
expect(output).toBeInstanceOf(PublicKey); | ||
expect(new PublicKey(address).equals(output)).toBeTruthy(); | ||
}); | ||
|
||
it("should accept a PublicKey address", () => { | ||
const publicKey = new PublicKey("11111111111111111111111111111111"); | ||
|
||
const func = () => translateAddress(publicKey); | ||
expect(func).not.toThrow(); | ||
|
||
const output = func(); | ||
expect(output).toBeInstanceOf(PublicKey); | ||
expect(new PublicKey(publicKey).equals(output)).toBe(true); | ||
}); | ||
|
||
it("should accept an object with a PublicKey shape { _bn }", () => { | ||
const obj = ({ | ||
_bn: new BN(bs58.decode("11111111111111111111111111111111")), | ||
} as any) as PublicKey; | ||
const func = () => translateAddress(obj); | ||
|
||
expect(func).not.toThrow(); | ||
const output = func(); | ||
|
||
expect(output).toBeInstanceOf(PublicKey); | ||
expect(new PublicKey(obj).equals(output)).toBe(true); | ||
}); | ||
|
||
it("should not accept an invalid string address", () => { | ||
const invalid = "invalid"; | ||
const func = () => translateAddress(invalid); | ||
expect(func).toThrow(); | ||
}); | ||
|
||
it("should not accept an invalid object", () => { | ||
const invalid = {} as PublicKey; | ||
const func = () => translateAddress(invalid); | ||
expect(func).toThrow(); | ||
}); | ||
}); | ||
}); |