Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/services/username/client.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ test('username client resolves accounts through resolver', async () => {

await using primaryServer = new KeetaNetUsernameAnchorHTTPServer({
logger: logger,
providerID,
usernamePattern: '^[a-z]+$',
usernames: {
async resolveUsername({ username }) {
Expand Down Expand Up @@ -140,7 +139,6 @@ test('username client resolves accounts through resolver', async () => {

await using secondaryServer = new KeetaNetUsernameAnchorHTTPServer({
logger: logger,
providerID: secondaryProviderID,
usernames: {
async resolveUsername({ username }) {
const account = secondaryAssignedAccounts.get(username);
Expand Down
8 changes: 0 additions & 8 deletions src/services/username/server.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,10 @@ const DEBUG = false;
const logger = DEBUG ? console : undefined;

test('username server resolves account and nulls', async () => {
const providerID = 'provider-abc';
const knownAccount = KeetaNet.lib.Account.fromSeed(KeetaNet.lib.Account.generateRandomSeed(), 0);

await using server = new KeetaNetUsernameAnchorHTTPServer({
logger: logger,
providerID,
usernames: {
async resolveUsername({ username }) {
if (username === 'alice') {
Expand Down Expand Up @@ -57,9 +55,7 @@ test('username server resolves account and nulls', async () => {
}, 10_000);

test('username server enforces usernamePattern when provided', async () => {
const providerID = 'provider-pattern';
await using server = new KeetaNetUsernameAnchorHTTPServer({
providerID,
usernamePattern: '^[a-z]+$',
usernames: {
async resolveUsername({ username }) {
Expand Down Expand Up @@ -104,9 +100,7 @@ test('username server enforces usernamePattern when provided', async () => {
}, 10_000);

test('username server enforces default validation rules', async () => {
const providerID = 'provider-default-validation';
await using server = new KeetaNetUsernameAnchorHTTPServer({
providerID,
usernames: {
async resolveAccount() { return(null); },
async resolveUsername() { return(null); }
Expand Down Expand Up @@ -146,7 +140,6 @@ test('username server enforces default validation rules', async () => {
}, 10_000);

test('username server validates signed transfers and release requests', async () => {
const providerID = 'provider-signatures';
const transferFromAccount = KeetaNet.lib.Account.fromSeed(KeetaNet.lib.Account.generateRandomSeed(), 0);
const transferToAccount = KeetaNet.lib.Account.fromSeed(KeetaNet.lib.Account.generateRandomSeed(), 0);
let claimCalls = 0;
Expand All @@ -157,7 +150,6 @@ test('username server validates signed transfers and release requests', async ()
let releaseMatchedAccount = false;

await using server = new KeetaNetUsernameAnchorHTTPServer({
providerID,
usernames: {
async resolveUsername() {
return(null);
Expand Down
3 changes: 0 additions & 3 deletions src/services/username/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ type SearchHandlerResponse = { results: KeetaUsernameAnchorUsernameWithAccount[]

export interface KeetaAnchorUsernameServerConfig extends KeetaAnchorHTTPServer.KeetaAnchorHTTPServerConfig {
homepage?: string | (() => Promise<string> | string);
providerID: string;
usernames: {
resolveUsername: (input: KeetaUsernameAnchorUsernameResolutionContext) => Promise<{ account: InstanceType<typeof KeetaNet.lib.Account>; } | null>;
resolveAccount: (input: KeetaUsernameAnchorAccountResolutionContext) => Promise<{ username: string; } | null>;
Expand All @@ -62,7 +61,6 @@ export interface KeetaAnchorUsernameServerConfig extends KeetaAnchorHTTPServer.K
export class KeetaNetUsernameAnchorHTTPServer extends KeetaAnchorHTTPServer.KeetaNetAnchorHTTPServer<KeetaAnchorUsernameServerConfig> {
readonly homepage: NonNullable<KeetaAnchorUsernameServerConfig['homepage']>;
readonly usernames: KeetaAnchorUsernameServerConfig['usernames'];
readonly providerID: string;
readonly routes: NonNullable<KeetaAnchorUsernameServerConfig['routes']>;
readonly #usernamePattern?: RegExp;

Expand All @@ -71,7 +69,6 @@ export class KeetaNetUsernameAnchorHTTPServer extends KeetaAnchorHTTPServer.Keet

this.homepage = config.homepage ?? '';
this.usernames = config.usernames;
this.providerID = config.providerID;
this.routes = config.routes ?? {};
if (config.usernamePattern !== undefined) {
this.#usernamePattern = normalizeUsernamePattern(config.usernamePattern);
Expand Down