Skip to content

Commit

Permalink
fix: fully commit to renaming it
Browse files Browse the repository at this point in the history
  • Loading branch information
whoabuddy committed Feb 22, 2024
1 parent 4b7e3ff commit 8e01b0c
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 38 deletions.
4 changes: 2 additions & 2 deletions Clarinet.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ telemetry = true
cache_dir = './.cache'
requirements = []

[contracts.stacks-m2m-abtc]
path = 'src/stacks-m2m-abtc.clar'
[contracts.stacks-m2m-aibtc]
path = 'src/stacks-m2m-aibtc.clar'
clarity_version = 2
epoch = 2.4

Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions src/stacks-m2m-v2.clar
Original file line number Diff line number Diff line change
Expand Up @@ -332,8 +332,8 @@
;; MAINNET
;; xBTC SP3K8BC0PPEVCV7NZ6QSRWPQ2JE9E5B6N3PA0KBR9.token-wbtc
;; aBTC SP3K8BC0PPEVCV7NZ6QSRWPQ2JE9E5B6N3PA0KBR9.token-abtc
(try! (contract-call? .stacks-m2m-abtc transfer (get price resourceData) contract-caller (var-get paymentAddress) memo))
(try! (contract-call? .stacks-m2m-abtc transfer (get price resourceData) contract-caller (var-get paymentAddress) none))
(try! (contract-call? .stacks-m2m-aibtc transfer (get price resourceData) contract-caller (var-get paymentAddress) memo))
(try! (contract-call? .stacks-m2m-aibtc transfer (get price resourceData) contract-caller (var-get paymentAddress) none))
)
;; return new count
(ok newCount)
Expand Down
40 changes: 20 additions & 20 deletions tests/stacks-m2m-abtc.test.ts → tests/stacks-m2m-aibtc.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,21 @@ const FAUCET_DRIP = 10_000; // 0.0001 BTC
const FAUCET_DROP = 1_000_000; // 0.01 BTC
const FAUCET_FLOOD = 100_000_000; // 1 BTC

describe("stacks-m2m-abtc", () => {
describe("stacks-m2m-aibtc", () => {
// faucet drip
it(`faucet-drip(): succeeds and mints ${FAUCET_DRIP} aBTC`, () => {
it(`faucet-drip(): succeeds and mints ${FAUCET_DRIP} aiBTC`, () => {
// ARRANGE
const accounts = simnet.getAccounts();
const address1 = accounts.get("wallet_1")!;
// ACT
const response = simnet.callPublicFn(
"stacks-m2m-abtc",
"stacks-m2m-aibtc",
"faucet-drip",
[Cl.principal(address1)],
address1
);
const balance = simnet.callReadOnlyFn(
"stacks-m2m-abtc",
"stacks-m2m-aibtc",
"get-balance",
[Cl.principal(address1)],
address1
Expand All @@ -33,19 +33,19 @@ describe("stacks-m2m-abtc", () => {
expect(balance.result).toBeOk(Cl.uint(FAUCET_DRIP));
});
// faucet drop
it(`faucet-drop(): succeeds and mints ${FAUCET_DROP} aBTC`, () => {
it(`faucet-drop(): succeeds and mints ${FAUCET_DROP} aiBTC`, () => {
// ARRANGE
const accounts = simnet.getAccounts();
const address1 = accounts.get("wallet_1")!;
// ACT
const response = simnet.callPublicFn(
"stacks-m2m-abtc",
"stacks-m2m-aibtc",
"faucet-drop",
[Cl.principal(address1)],
address1
);
const balance = simnet.callReadOnlyFn(
"stacks-m2m-abtc",
"stacks-m2m-aibtc",
"get-balance",
[Cl.principal(address1)],
address1
Expand All @@ -55,19 +55,19 @@ describe("stacks-m2m-abtc", () => {
expect(balance.result).toBeOk(Cl.uint(FAUCET_DROP));
});
// faucet flood
it(`faucet-flood(): succeeds and mints ${FAUCET_FLOOD} aBTC`, () => {
it(`faucet-flood(): succeeds and mints ${FAUCET_FLOOD} aiBTC`, () => {
// ARRANGE
const accounts = simnet.getAccounts();
const address1 = accounts.get("wallet_1")!;
// ACT
const response = simnet.callPublicFn(
"stacks-m2m-abtc",
"stacks-m2m-aibtc",
"faucet-flood",
[Cl.principal(address1)],
address1
);
const balance = simnet.callReadOnlyFn(
"stacks-m2m-abtc",
"stacks-m2m-aibtc",
"get-balance",
[Cl.principal(address1)],
address1
Expand All @@ -77,7 +77,7 @@ describe("stacks-m2m-abtc", () => {
expect(balance.result).toBeOk(Cl.uint(FAUCET_FLOOD));
});
// transfer works
it("transfer(): succeeds and transfers aBTC between accounts", () => {
it("transfer(): succeeds and transfers aiBTC between accounts", () => {
// ARRANGE
const accounts = simnet.getAccounts();
const address1 = accounts.get("wallet_1")!;
Expand All @@ -86,19 +86,19 @@ describe("stacks-m2m-abtc", () => {

const funding = [
simnet.callPublicFn(
"stacks-m2m-abtc",
"stacks-m2m-aibtc",
"faucet-flood",
[Cl.principal(address1)],
address1
),
simnet.callPublicFn(
"stacks-m2m-abtc",
"stacks-m2m-aibtc",
"faucet-flood",
[Cl.principal(address2)],
address2
),
simnet.callPublicFn(
"stacks-m2m-abtc",
"stacks-m2m-aibtc",
"faucet-flood",
[Cl.principal(address3)],
address3
Expand All @@ -108,7 +108,7 @@ describe("stacks-m2m-abtc", () => {

// xfer from 1 to 2
const transfer1 = simnet.callPublicFn(
"stacks-m2m-abtc",
"stacks-m2m-aibtc",
"transfer",
[
Cl.uint(FAUCET_DRIP),
Expand All @@ -120,7 +120,7 @@ describe("stacks-m2m-abtc", () => {
);
// xfer from 2 to 3
const transfer2 = simnet.callPublicFn(
"stacks-m2m-abtc",
"stacks-m2m-aibtc",
"transfer",
[
Cl.uint(FAUCET_DROP),
Expand All @@ -132,7 +132,7 @@ describe("stacks-m2m-abtc", () => {
);
// xfer from 3 to 1
const transfer3 = simnet.callPublicFn(
"stacks-m2m-abtc",
"stacks-m2m-aibtc",
"transfer",
[
Cl.uint(FAUCET_FLOOD),
Expand All @@ -145,19 +145,19 @@ describe("stacks-m2m-abtc", () => {

// get balances
const balance1 = simnet.callReadOnlyFn(
"stacks-m2m-abtc",
"stacks-m2m-aibtc",
"get-balance",
[Cl.principal(address1)],
address1
);
const balance2 = simnet.callReadOnlyFn(
"stacks-m2m-abtc",
"stacks-m2m-aibtc",
"get-balance",
[Cl.principal(address2)],
address1
);
const balance3 = simnet.callReadOnlyFn(
"stacks-m2m-abtc",
"stacks-m2m-aibtc",
"get-balance",
[Cl.principal(address3)],
address1
Expand Down
28 changes: 14 additions & 14 deletions tests/stacks-m2m-v2.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const createResource = (name: string, desc: string, price: number) => {
return [Cl.stringUtf8(name), Cl.stringUtf8(desc), Cl.uint(price)];
};

const defaultPrice = 10_000; // 0.0001 aBTC
const defaultPrice = 10_000; // 0.0001 aiBTC

const testResource = [
Cl.stringUtf8("Bitcoin Face"),
Expand Down Expand Up @@ -573,9 +573,9 @@ describe("Paying an Invoice", () => {
const address1 = accounts.get("wallet_1")!;
const expectedCount = 1;
// ACT
// mint aBTC to pay for resources
// mint aiBTC to pay for resources
simnet.callPublicFn(
"stacks-m2m-abtc",
"stacks-m2m-aibtc",
"faucet-flood",
[Cl.principal(address1)],
address1
Expand Down Expand Up @@ -609,9 +609,9 @@ describe("Paying an Invoice", () => {
const expectedCount = 1;
const memo = Buffer.from("This is a memo test!");
// ACT
// mint aBTC to pay for resources
// mint aiBTC to pay for resources
simnet.callPublicFn(
"stacks-m2m-abtc",
"stacks-m2m-aibtc",
"faucet-flood",
[Cl.principal(address1)],
address1
Expand Down Expand Up @@ -647,23 +647,23 @@ describe("Paying an Invoice", () => {
const expectedCount = 1;
const memo = Cl.none();
// ACT
// mint aBTC to pay for resources
// mint aiBTC to pay for resources
simnet.callPublicFn(
"stacks-m2m-abtc",
"stacks-m2m-aibtc",
"faucet-flood",
[Cl.principal(address1)],
address1
);
// mint aBTC to pay for resources
// mint aiBTC to pay for resources
simnet.callPublicFn(
"stacks-m2m-abtc",
"stacks-m2m-aibtc",
"faucet-flood",
[Cl.principal(address2)],
address2
);
// mint aBTC to pay for resources
// mint aiBTC to pay for resources
simnet.callPublicFn(
"stacks-m2m-abtc",
"stacks-m2m-aibtc",
"faucet-flood",
[Cl.principal(address3)],
address3
Expand Down Expand Up @@ -751,15 +751,15 @@ describe("Paying an Invoice", () => {
const deployer = accounts.get("deployer")!;
const memo = Cl.none();
// ACT
// mint aBTC to pay for resources
// mint aiBTC to pay for resources
simnet.callPublicFn(
"stacks-m2m-abtc",
"stacks-m2m-aibtc",
"faucet-flood",
[Cl.principal(address1)],
address1
);
simnet.callPublicFn(
"stacks-m2m-abtc",
"stacks-m2m-aibtc",
"faucet-flood",
[Cl.principal(address2)],
address2
Expand Down

0 comments on commit 8e01b0c

Please sign in to comment.