Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix tests #8

Open
wants to merge 1 commit into
base: remove-clockwork
Choose a base branch
from
Open

fix tests #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion Anchor.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
seeds = true
skip-lint = false

[programs.localnet]
referrals = "AyiEeNNyt46iRMeN1kNUfBjdu9GdsDxuH7zAg9CgyLRC"
plege = "7xMy6CDMk3ANhRBEMorr9A3EJt5qWcQq64MeqGdC9JpA"

[programs.devnet]
referrals = "AyiEeNNyt46iRMeN1kNUfBjdu9GdsDxuH7zAg9CgyLRC"
plege = "7xMy6CDMk3ANhRBEMorr9A3EJt5qWcQq64MeqGdC9JpA"
Expand All @@ -10,7 +14,7 @@ plege = "7xMy6CDMk3ANhRBEMorr9A3EJt5qWcQq64MeqGdC9JpA"
url = "https://api.apr.dev"

[provider]
cluster = "devnet"
cluster = "localnet"
wallet = "~/.config/solana/id.json"

[scripts]
Expand Down
148 changes: 75 additions & 73 deletions tests/basic.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
import * as anchor from "@project-serum/anchor"
import * as anchor from "@project-serum/anchor";
import {
createAssociatedTokenAccount,
getAccount,
mintToChecked,
} from "@solana/spl-token"
import { BN, Program } from "@project-serum/anchor"
import chai from "chai"
import chaiAsPromised from "chai-as-promised"
} from "@solana/spl-token";
import { BN, Program } from "@project-serum/anchor";
import chai from "chai";
import chaiAsPromised from "chai-as-promised";
import {
cancelSubscription,
completePayment,
createSubscription,
} from "./utils/basic-functions"
import { Plege } from "../target/types/plege"
} from "./utils/basic-functions";
import { Plege } from "../target/types/plege";

chai.use(chaiAsPromised)
const expect = chai.expect
chai.use(chaiAsPromised);
const expect = chai.expect;

describe("basic flow", () => {
it("creates user", async () => {
Expand All @@ -25,8 +25,8 @@ describe("basic flow", () => {
auth: global.testKeypairs.colossal.publicKey,
})
.signers([global.testKeypairs.colossal])
.rpc()
})
.rpc();
});

it("creates app", async () => {
await program.methods
Expand All @@ -37,13 +37,13 @@ describe("basic flow", () => {
treasury: global.testKeypairs.hacker.publicKey,
})
.signers([global.testKeypairs.colossal])
.rpc()
.rpc();

const appPDA = await program.account.app.fetch(app)
const appPDA = await program.account.app.fetch(app);
expect(appPDA.auth.toBase58()).to.equal(
global.testKeypairs.colossal.publicKey.toBase58()
)
})
);
});

it("create tier", async () => {
await program.methods
Expand All @@ -53,70 +53,70 @@ describe("basic flow", () => {
signer: global.testKeypairs.colossal.publicKey,
})
.signers([global.testKeypairs.colossal])
.rpc()
.rpc();

const tierPDA = await program.account.tier.fetch(tier)
expect(tierPDA.app.toBase58()).to.equal(app.toBase58())
expect(tierPDA.price.toNumber()).to.equal(10)
expect((tierPDA.interval as any).month).to.not.equal(undefined)
})
const tierPDA = await program.account.tier.fetch(tier);
expect(tierPDA.app.toBase58()).to.equal(app.toBase58());
expect(tierPDA.price.toNumber()).to.equal(10);
expect((tierPDA.interval as any).month).to.not.equal(undefined);
});

it("create subscription", async () => {
const { subscription, subscriptionThread } = await createSubscription(
app,
tier,
global.testKeypairs.subscriber,
subscriberAta
)
);

const subscriptionPDA = await program.account.subscription.fetch(
subscription
)
);

expect(subscriptionPDA.app.toBase58()).to.equal(app.toBase58())
expect(subscriptionPDA.tier.toBase58()).to.equal(tier.toBase58())
expect(subscriptionPDA.app.toBase58()).to.equal(app.toBase58());
expect(subscriptionPDA.tier.toBase58()).to.equal(tier.toBase58());
expect(subscriptionPDA.subscriber.toBase58()).to.equal(
global.testKeypairs.subscriber.publicKey.toBase58()
)
const startTime = new Date(subscriptionPDA.start.toNumber() * 1000)
expect(new Date().getTime() - startTime.getTime()).to.be.lessThan(5000)
);
const startTime = new Date(subscriptionPDA.start.toNumber() * 1000);
expect(new Date().getTime() - startTime.getTime()).to.be.lessThan(5000);
expect(subscriptionPDA.start.toNumber()).to.equal(
subscriptionPDA.payPeriodExpiration.toNumber()
)
})
);
});

it("completes payment", async () => {
const before = await program.account.subscription.fetch(subscription)
const before = await program.account.subscription.fetch(subscription);

await completePayment(app, tier, hackerAta, subscriberAta, subscription)
await completePayment(app, tier, hackerAta, subscriberAta, subscription);

const subscriptionPDA = await program.account.subscription.fetch(
subscription
)
);

const ownerATA = await getAccount(global.connection, hackerAta)
const ownerATA = await getAccount(global.connection, hackerAta);

let payPeriod = new Date(before.payPeriodExpiration.toNumber() * 1000)
payPeriod.setMonth(payPeriod.getMonth() + 1)
let payPeriod = new Date(before.payPeriodExpiration.toNumber() * 1000);
payPeriod.setMonth(payPeriod.getMonth() + 1);
expect(subscriptionPDA.payPeriodExpiration.toNumber() * 1000).to.equal(
payPeriod.getTime()
)
expect(Number(ownerATA.amount)).to.equal(10)
})
);
expect(Number(ownerATA.amount)).to.equal(10);
});

it("cancels subscription", async () => {
await cancelSubscription(
app,
tier,
global.testKeypairs.subscriber,
subscriberAta
)
);

const subscriptionPDA = await program.account.subscription.fetch(
subscription
)
expect(subscriptionPDA.acceptNewPayments).to.equal(false)
})
);
expect(subscriptionPDA.acceptNewPayments).to.equal(false);
});

it("attempting to create subscription again fails", async () => {
expect(
Expand All @@ -126,10 +126,10 @@ describe("basic flow", () => {
global.testKeypairs.subscriber,
subscriberAta
)
).to.eventually.be.rejected
})
).to.eventually.be.rejected;
});

// it("can close subscription")
// it("can close subscription");

// it("can create subscription again after closing account", async () => {
// await global.program.methods
Expand All @@ -143,83 +143,85 @@ describe("basic flow", () => {
// subscriberAta,
// })
// .signers([global.testKeypairs.subscriber])
// .rpc()
// .rpc();

// const subscriptionPDA = await global.program.account.subscription.fetch(
// subscription
// )
// );

// expect(subscriptionPDA.app.toBase58()).to.equal(app.toBase58())
// expect(subscriptionPDA.tier.toBase58()).to.equal(tier.toBase58())
// expect(subscriptionPDA.app.toBase58()).to.equal(app.toBase58());
// expect(subscriptionPDA.tier.toBase58()).to.equal(tier.toBase58());
// expect(subscriptionPDA.subscriber.toBase58()).to.equal(
// global.testKeypairs.subscriber.publicKey.toBase58()
// )
// const startTime = new Date(subscriptionPDA.start * 1000)
// expect(new Date().getTime() - startTime.getTime()).to.be.lessThan(5000)
// );
// const startTime = new Date(subscriptionPDA.start * 1000);
// expect(new Date().getTime() - startTime.getTime()).to.be.lessThan(5000);
// expect(subscriptionPDA.start.toNumber()).to.equal(
// subscriptionPDA.payPeriodExpiration.toNumber()
// )
// })
// );
// });

before(async () => {
program = global.program as Program<Plege>
;[app] = anchor.web3.PublicKey.findProgramAddressSync(
program = global.program as Program<Plege>;
[app] = anchor.web3.PublicKey.findProgramAddressSync(
[
Buffer.from("APP"),
global.testKeypairs.colossal.publicKey.toBuffer(),
new BN([1]).toArrayLike(Buffer, "be", 1),
],
program.programId
)
;[tier] = anchor.web3.PublicKey.findProgramAddressSync(
);
[tier] = anchor.web3.PublicKey.findProgramAddressSync(
[
Buffer.from("SUBSCRIPTION_TIER"),
app.toBuffer(),
new BN([1]).toArrayLike(Buffer, "be", 1),
],
program.programId
)
;[subscription] = anchor.web3.PublicKey.findProgramAddressSync(
);
[subscription] = anchor.web3.PublicKey.findProgramAddressSync(
[
Buffer.from("SUBSCRIPTION"),
app.toBuffer(),
global.testKeypairs.subscriber.publicKey.toBuffer(),
],
program.programId
)
);

threadProgram = new anchor.web3.PublicKey(
"3XXuUFfweXBwFgFfYaejLvZE4cGZiHgKiGfMtdxNzYmv"
)
;[thread] = anchor.web3.PublicKey.findProgramAddressSync(
);
[thread] = anchor.web3.PublicKey.findProgramAddressSync(
[
Buffer.from("thread"),
subscription.toBuffer(),
Buffer.from("subscriber_thread"),
],
threadProgram
)
);

colossalAta = await createAssociatedTokenAccount(
global.connection,
global.testKeypairs.colossal,
global.mint,
global.testKeypairs.colossal.publicKey
)
).catch((err) => {
console.log(err);
});

subscriberAta = await createAssociatedTokenAccount(
global.connection,
global.testKeypairs.subscriber,
global.mint,
global.testKeypairs.subscriber.publicKey
)
);

hackerAta = await createAssociatedTokenAccount(
global.connection,
global.testKeypairs.hacker,
global.mint,
global.testKeypairs.hacker.publicKey
)
);

await mintToChecked(
global.connection,
Expand All @@ -229,8 +231,8 @@ describe("basic flow", () => {
global.testKeypairs.colossal.publicKey,
1000 * 10 ** 5,
5
)
})
);
});

let colossalAta,
subscriberAta,
Expand All @@ -239,7 +241,7 @@ describe("basic flow", () => {
tier,
subscription,
thread,
threadProgram
threadProgram;

let program: Program<Plege>
})
let program: Program<Plege>;
});
Loading