Skip to content

Commit

Permalink
fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Filipp Makarov authored and Filipp Makarov committed Feb 13, 2024
1 parent 1a11bd4 commit a5ac5a4
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 33 deletions.
64 changes: 34 additions & 30 deletions test/module/BatchedSessionRouter.Module.specs.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,13 +92,17 @@ describe("SessionKey: Batched Session Router", async () => {
).deploy();

const maxUsage = 10;
const maxUsageAndSAAddress = ethers.utils.hexConcat([
userSA.address,
ethers.utils.hexZeroPad(ethers.utils.hexlify(maxUsage), 8),
]);

const { sessionKeyData, leafData } = await getERC20SessionKeyParams(
sessionKey.address,
mockToken.address,
mockProtocol.address,
maxAmount,
maxUsage,
maxUsageAndSAAddress,
0,
0,
erc20SessionModule.address
Expand All @@ -115,7 +119,7 @@ describe("SessionKey: Batched Session Router", async () => {
mockProtocol.address, // contract to interact with
mockToken.address, // token to transfer to protocol
maxAmount,
maxUsage,
maxUsageAndSAAddress,
validUntilForMockProtocol,
0,
mockProtocolSVModule.address
Expand Down Expand Up @@ -157,7 +161,7 @@ describe("SessionKey: Batched Session Router", async () => {
mockProtocol: mockProtocol,
mockProtocolSVM: mockProtocolSVModule,
validUntilForMockProtocol: validUntilForMockProtocol,
maxUsage: maxUsage,
maxUsage: maxUsageAndSAAddress,
};
}
);
Expand Down Expand Up @@ -205,15 +209,15 @@ describe("SessionKey: Batched Session Router", async () => {
erc20SessionModule.address,
sessionKeyData,
merkleTree.getHexProof(ethers.utils.keccak256(leafData)),
userSA.address,
"0x",
],
[
validUntilForMockProtocol,
0,
mockProtocolSVM.address,
sessionKeyData2,
merkleTree.getHexProof(ethers.utils.keccak256(leafData2)),
userSA.address,
"0x",
],
],
sessionRouter.address
Expand Down Expand Up @@ -294,15 +298,15 @@ describe("SessionKey: Batched Session Router", async () => {
erc20SessionModule.address,
sessionKeyData,
merkleTree.getHexProof(ethers.utils.keccak256(leafData)),
userSA.address,
"0x",
],
[
validUntilForMockProtocol,
0,
mockProtocolSVM.address,
sessionKeyData2,
merkleTree.getHexProof(ethers.utils.keccak256(leafData2)),
userSA.address,
"0x",
],
],
randomValueOfWrongType,
Expand Down Expand Up @@ -371,15 +375,15 @@ describe("SessionKey: Batched Session Router", async () => {
erc20SessionModule.address,
sessionKeyData,
merkleTree.getHexProof(ethers.utils.keccak256(leafData)),
userSA.address,
"0x",
],
[
validUntilForMockProtocol,
0,
mockProtocolSVM.address,
sessionKeyData2,
merkleTree.getHexProof(ethers.utils.keccak256(leafData2)),
userSA.address,
"0x",
],
],
sessionRouter.address
Expand Down Expand Up @@ -471,7 +475,7 @@ describe("SessionKey: Batched Session Router", async () => {
erc20SessionModule.address,
sessionKeyData,
merkleTree.getHexProof(ethers.utils.keccak256(leafData)),
userSA.address,
"0x",
],
];

Expand Down Expand Up @@ -548,15 +552,15 @@ describe("SessionKey: Batched Session Router", async () => {
erc20SessionModule.address,
sessionKeyData,
merkleTree.getHexProof(ethers.utils.keccak256(leafData)),
userSA.address,
"0x",
],
[
validUntilForMockProtocol,
0,
mockProtocolSVM.address,
sessionKeyData2,
merkleTree.getHexProof(ethers.utils.keccak256(leafData2)),
userSA.address,
"0x",
],
],
sessionRouter.address
Expand Down Expand Up @@ -618,15 +622,15 @@ describe("SessionKey: Batched Session Router", async () => {
erc20SessionModule.address,
sessionKeyData,
merkleTree.getHexProof(ethers.utils.keccak256(leafData)),
userSA.address,
"0x",
],
[
validUntilForMockProtocol,
0,
mockProtocolSVM.address,
sessionKeyData2,
merkleTree.getHexProof(ethers.utils.keccak256(leafData2)),
userSA.address,
"0x",
],
],
sessionRouter.address
Expand Down Expand Up @@ -695,15 +699,15 @@ describe("SessionKey: Batched Session Router", async () => {
erc20SessionModule.address,
sessionKeyData,
merkleTree.getHexProof(ethers.utils.keccak256(leafData)),
userSA.address,
"0x",
],
[
wrongValidUntil,
0,
mockProtocolSVM.address,
sessionKeyData2,
merkleTree.getHexProof(ethers.utils.keccak256(leafData2)),
userSA.address,
"0x",
],
],
sessionRouter.address
Expand Down Expand Up @@ -767,15 +771,15 @@ describe("SessionKey: Batched Session Router", async () => {
erc20SessionModule.address,
sessionKeyData,
merkleTree.getHexProof(ethers.utils.keccak256(leafData)),
userSA.address,
"0x",
],
[
validUntilForMockProtocol,
0,
mockProtocolSVM.address,
sessionKeyData2,
merkleTree.getHexProof(ethers.utils.keccak256(leafData2)),
userSA.address,
"0x",
],
],
sessionRouter.address
Expand Down Expand Up @@ -840,15 +844,15 @@ describe("SessionKey: Batched Session Router", async () => {
wrongSessionValidationModuleAddress,
sessionKeyData,
merkleTree.getHexProof(ethers.utils.keccak256(leafData)),
userSA.address,
"0x",
],
[
validUntilForMockProtocol,
0,
mockProtocolSVM.address,
sessionKeyData2,
merkleTree.getHexProof(ethers.utils.keccak256(leafData2)),
userSA.address,
"0x",
],
],
sessionRouter.address
Expand Down Expand Up @@ -914,15 +918,15 @@ describe("SessionKey: Batched Session Router", async () => {
erc20SessionModule.address,
sessionKeyData,
merkleTree.getHexProof(ethers.utils.keccak256(leafData)),
userSA.address,
"0x",
],
[
validUntilForMockProtocol,
0,
mockProtocolSVM.address,
sessionKeyData2,
merkleTree.getHexProof(ethers.utils.keccak256(leafData2)),
userSA.address,
"0x",
],
],
sessionRouter.address
Expand Down Expand Up @@ -996,15 +1000,15 @@ describe("SessionKey: Batched Session Router", async () => {
erc20SessionModule.address,
wrongSessionKeyData,
merkleTree.getHexProof(ethers.utils.keccak256(leafData)),
userSA.address,
"0x",
],
[
validUntilForMockProtocol,
0,
mockProtocolSVM.address,
sessionKeyData2,
merkleTree.getHexProof(ethers.utils.keccak256(leafData2)),
userSA.address,
"0x",
],
],
sessionRouter.address
Expand Down Expand Up @@ -1068,15 +1072,15 @@ describe("SessionKey: Batched Session Router", async () => {
erc20SessionModule.address,
sessionKeyData,
merkleTree.getHexProof(ethers.utils.keccak256(leafData)),
userSA.address,
"0x",
],
[
validUntilForMockProtocol,
0,
mockProtocolSVM.address,
sessionKeyData2,
merkleTree.getHexProof(ethers.utils.keccak256(leafData2)),
userSA.address,
"0x",
],
],
sessionRouter.address
Expand Down Expand Up @@ -1158,15 +1162,15 @@ describe("SessionKey: Batched Session Router", async () => {
erc20SessionModule.address,
sessionKeyData,
merkleTree.getHexProof(ethers.utils.keccak256(leafData)),
userSA.address,
"0x",
],
[
validUntilForMockProtocol,
0,
mockProtocolSVM.address,
sessionKeyData2,
merkleTree.getHexProof(ethers.utils.keccak256(leafData2)),
userSA.address,
"0x",
],
],
sessionRouter.address
Expand Down Expand Up @@ -1245,15 +1249,15 @@ describe("SessionKey: Batched Session Router", async () => {
erc20SessionModule.address,
sessionKeyData,
merkleTree.getHexProof(ethers.utils.keccak256(leafData)),
userSA.address,
"0x",
],
[
validUntilForMockProtocol,
0,
mockProtocolSVM.address,
sessionKeyData2,
merkleTree.getHexProof(ethers.utils.keccak256(leafData2)),
userSA.address,
"0x",
],
];

Expand Down
6 changes: 5 additions & 1 deletion test/module/MultichainValidator.Module.specs.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,14 +105,18 @@ describe("MultichainValidator Module", async () => {
// ============== session key setup =============

const maxUsageOfTheSession = 10;
const maxUsageAndSAAddress = ethers.utils.hexConcat([
expectedSmartAccountAddress,
ethers.utils.hexZeroPad(ethers.utils.hexlify(maxUsageOfTheSession), 8),
]);

// Get Session Key Params
const { leafData } = await getERC20SessionKeyParams(
sessionKey.address,
mockToken.address,
charlie.address,
maxAmount,
maxUsageOfTheSession,
maxUsageAndSAAddress,
0,
0,
erc20SessionModule.address
Expand Down
2 changes: 0 additions & 2 deletions test/module/SessionValidationModules/ERC20SessionValidation.Module.specs.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,6 @@ describe("SessionKey: ERC20 Session Validation Module", async () => {
ethers.utils.hexZeroPad(ethers.utils.hexlify(maxUsageOfTheSession), 8),
]);

console.log(maxUsageAndSAAddress);

const { sessionKeyData, leafData } = await getERC20SessionKeyParams(
sessionKey.address,
mockToken.address,
Expand Down

0 comments on commit a5ac5a4

Please sign in to comment.