Skip to content

Commit

Permalink
relocate test files
Browse files Browse the repository at this point in the history
  • Loading branch information
cristovaoth committed Jan 27, 2025
1 parent 0825fe7 commit 97d79b1
Show file tree
Hide file tree
Showing 11 changed files with 30 additions and 26 deletions.
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import { AbiCoder, concat, hexlify, zeroPadValue } from "ethers"
import { expect, it, suite } from "vitest"
import { AbiCoder, concat, hexlify, zeroPadValue } from "ethers"
import { Allowance } from "zodiac-roles-deployments"

import { applyAllowances } from "./allowances"

import { Roles__factory } from "../../evm/typechain-types"
import { applyAllowances } from "../src/allowances"

const iface = Roles__factory.createInterface()

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import { expect, it, suite } from "vitest"
import { ExecutionOptions } from "zodiac-roles-deployments"

import { removeObsoleteCalls } from "../src/calls"
import { Call } from "../src/calls/types"
import { removeObsoleteCalls } from "./removeObsoleteCalls"

import { Call } from "./types"

suite("removeObsoleteCalls", () => {
it("should remove function permission updates if later on the entire target is cleared", () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import { Operator, ParameterType } from "zodiac-roles-deployments"
import {
checkConditionIntegrity,
checkRootConditionIntegrity,
} from "../src/conditions"
import { encodeAbiParameters } from "../src/utils/encodeAbiParameters"
} from "./checkConditionIntegrity"
import { encodeAbiParameters } from "../utils/encodeAbiParameters"

suite("checkConditionIntegrity()", () => {
it("should throw for And without children", () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { expect, it, suite } from "vitest"
import { Operator, ParameterType } from "zodiac-roles-deployments"

import { conditionAddress, normalizeCondition } from "../src/conditions"
import { conditionAddress } from "./conditionId"
import { normalizeCondition } from "./normalizeCondition"

suite("conditionAddress", () => {
it("calculates the create2 storage address of the condition", () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import { expect, it, suite } from "vitest"
import { Operator, ParameterType } from "zodiac-roles-deployments"

import { normalizeCondition } from "../src/conditions"
import { stripIds } from "../src/conditions/normalizeCondition"
import { FunctionPermissionCoerced, c } from "../src/permissions"
import { allow } from "../src/entrypoints/kit"
import { mergeFunctionPermissions } from "../src/permissions/mergeFunctionPermissions"
import { encodeAbiParameters } from "../src/utils/encodeAbiParameters"
import { normalizeCondition, stripIds } from "./normalizeCondition"
import { c, FunctionPermissionCoerced } from "../permissions"
import { allow } from "../entrypoints/kit"
import { mergeFunctionPermissions } from "../permissions/mergeFunctionPermissions"
import { encodeAbiParameters } from "../utils/encodeAbiParameters"

const DUMMY_COMP = (id: number) => ({
paramType: ParameterType.Static,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { expect, it, suite } from "vitest"
import { Condition, Operator, ParameterType } from "zodiac-roles-deployments"

import { normalizeCondition } from "../src/conditions"
import { splitCondition } from "../src/conditions/splitCondition"
import { encodeAbiParameters } from "../src/utils/encodeAbiParameters"
import { normalizeCondition } from "./normalizeCondition"
import { splitCondition } from "./splitCondition"
import { encodeAbiParameters } from "../utils/encodeAbiParameters"

const DUMMY_COMP = (id: number): Condition => ({
paramType: ParameterType.Static,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { expect, it, suite } from "vitest"

import { processAnnotations } from "../src/entrypoints/annotations"
import { PermissionCoerced } from "../src/permissions"
import { processAnnotations } from "./annotations"
import { PermissionCoerced } from "../permissions"

suite("processAnnotations()", () => {
it("returns the original set of permissions if no annotations are given", async () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { expect, it, suite } from "vitest"
import { Operator, ParameterType, Target } from "zodiac-roles-deployments"

import { replaceTargets } from "../src/targets/applyTargets"
import { replaceTargets } from "./applyTargets"

suite("replaceTargets", () => {
it("should revoke function-scoped targets", () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
Target,
} from "zodiac-roles-deployments"

import { diffTargets } from "../src/targets/diffTargets"
import { diffTargets } from "./diffTargets"

suite("diffTargets", () => {
it("should correctly diff target-cleared targets", () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
import { expect, it, suite } from "vitest"

import {
Permission,
processPermissions,
reconstructPermissions,
} from "../src/permissions"
import { diffTargets, splitTargets } from "../src/targets"
} from "../permissions"
import { splitTargets } from "./splitTargets"
import { diffTargets } from "./diffTargets"

suite("splitTargets", () => {
it("splits so that both shares combined yield the original permissions", () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { test } from "vitest"
import { BigNumberish } from "ethers"

import * as c from "../src/permissions/authoring/conditions"
import { Scoping } from "../src/permissions/authoring/conditions/types"
import * as c from "./permissions/authoring/conditions"
import { Scoping } from "./permissions/authoring/conditions/types"

test("typings", async () => {
// These are tests of the typing system, not the runtime behavior.
Expand Down Expand Up @@ -32,8 +32,8 @@ test("typings", async () => {
values.length === 0
? undefined
: values.length === 1
? values[0]
: c.or(...(values as [string, string, ...string[]]))
? values[0]
: c.or(...(values as [string, string, ...string[]]))

// It should be allowed to only define scoping for some struct fields
const _t06: Scoping<{ a: string; b: number }> = { a: oneOf(["foo", "bar"]) }
Expand Down

0 comments on commit 97d79b1

Please sign in to comment.