Skip to content

Commit 2052dd5

Browse files
rob1997rob1997
committed
tests fixed
1 parent 01f35f3 commit 2052dd5

2 files changed

Lines changed: 78 additions & 10 deletions

File tree

‎test/Asset.t.sol‎

Lines changed: 69 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,15 @@ contract AssetTest is BaseTest {
8686
uint256 assetBalanceBefore = testToken.balanceOf(address(asset));
8787

8888
vm.expectEmit(true, true, true, true);
89-
emit Asset.SubscriptionAdded(SUBSCRIBER, block.timestamp, block.timestamp + DURATION, 0, signer);
89+
emit Asset.SubscriptionAdded(
90+
SUBSCRIBER,
91+
block.timestamp,
92+
block.timestamp + DURATION,
93+
0,
94+
signer,
95+
SUBSCRIPTION_PRICE,
96+
assetRegistry.getRegistryFeeShare()
97+
);
9098

9199
uint256 subscription = _subscribe(DURATION);
92100

@@ -110,7 +118,9 @@ contract AssetTest is BaseTest {
110118
for (uint256 i = 0; i < count; i++) {
111119
vm.expectEmit(true, true, true, true);
112120
if (i == 0) {
113-
emit Asset.SubscriptionAdded(SUBSCRIBER, deadline, deadline + DURATION, i, signer);
121+
emit Asset.SubscriptionAdded(
122+
SUBSCRIBER, deadline, deadline + DURATION, i, signer, SUBSCRIPTION_PRICE, assetRegistry.getRegistryFeeShare()
123+
);
114124
} else {
115125
emit Asset.SubscriptionExtended(SUBSCRIBER, deadline + DURATION);
116126
}
@@ -916,35 +926,67 @@ contract AssetTest is BaseTest {
916926

917927
function test_subscribe_newNonce_differentPrice() public {
918928
vm.expectEmit(true, true, true, true);
919-
emit Asset.SubscriptionAdded(SUBSCRIBER, block.timestamp, block.timestamp + DURATION, 0, signer);
929+
emit Asset.SubscriptionAdded(
930+
SUBSCRIBER,
931+
block.timestamp,
932+
block.timestamp + DURATION,
933+
0,
934+
signer,
935+
SUBSCRIPTION_PRICE,
936+
assetRegistry.getRegistryFeeShare()
937+
);
920938
_subscribe(DURATION);
921939

922940
vm.prank(assetOwner);
923941
asset.setSubscriptionPrice(SUBSCRIPTION_PRICE * 2);
924942

925943
uint256 newStart = block.timestamp + DURATION;
926944
vm.expectEmit(true, true, true, true);
927-
emit Asset.SubscriptionAdded(SUBSCRIBER, newStart, newStart + DURATION, 1, signer);
945+
emit Asset.SubscriptionAdded(
946+
SUBSCRIBER,
947+
newStart,
948+
newStart + DURATION,
949+
1,
950+
signer,
951+
SUBSCRIPTION_PRICE * 2,
952+
assetRegistry.getRegistryFeeShare()
953+
);
928954
_subscribe(DURATION);
929955
}
930956

931957
function test_subscribe_newNonce_feeShareChanged() public {
932958
vm.expectEmit(true, true, true, true);
933-
emit Asset.SubscriptionAdded(SUBSCRIBER, block.timestamp, block.timestamp + DURATION, 0, signer);
959+
emit Asset.SubscriptionAdded(
960+
SUBSCRIBER,
961+
block.timestamp,
962+
block.timestamp + DURATION,
963+
0,
964+
signer,
965+
SUBSCRIPTION_PRICE,
966+
assetRegistry.getRegistryFeeShare()
967+
);
934968
_subscribe(DURATION);
935969

936970
vm.prank(registryOwner);
937971
assetRegistry.updateRegistryFeeShare(50);
938972

939973
uint256 newStart = block.timestamp + DURATION;
940974
vm.expectEmit(true, true, true, true);
941-
emit Asset.SubscriptionAdded(SUBSCRIBER, newStart, newStart + DURATION, 1, signer);
975+
emit Asset.SubscriptionAdded(SUBSCRIBER, newStart, newStart + DURATION, 1, signer, SUBSCRIPTION_PRICE, 50);
942976
_subscribe(DURATION);
943977
}
944978

945979
function test_subscribe_newNonce_differentPayer() public {
946980
vm.expectEmit(true, true, true, true);
947-
emit Asset.SubscriptionAdded(SUBSCRIBER, block.timestamp, block.timestamp + DURATION, 0, signer);
981+
emit Asset.SubscriptionAdded(
982+
SUBSCRIBER,
983+
block.timestamp,
984+
block.timestamp + DURATION,
985+
0,
986+
signer,
987+
SUBSCRIPTION_PRICE,
988+
assetRegistry.getRegistryFeeShare()
989+
);
948990
_subscribe(DURATION);
949991

950992
uint256 key2 = vm.deriveKey(MNEMONIC, 1);
@@ -960,7 +1002,15 @@ contract AssetTest is BaseTest {
9601002

9611003
uint256 newStart = block.timestamp + DURATION;
9621004
vm.expectEmit(true, true, true, true);
963-
emit Asset.SubscriptionAdded(SUBSCRIBER, newStart, newStart + DURATION, 1, payer2);
1005+
emit Asset.SubscriptionAdded(
1006+
SUBSCRIBER,
1007+
newStart,
1008+
newStart + DURATION,
1009+
1,
1010+
payer2,
1011+
SUBSCRIPTION_PRICE,
1012+
assetRegistry.getRegistryFeeShare()
1013+
);
9641014
asset.subscribe(SUBSCRIBER, payer2, address(asset), value, deadline, v, r, s);
9651015
}
9661016

@@ -986,6 +1036,8 @@ contract AssetTest is BaseTest {
9861036
emit Asset.CreatorFeeClaimed(SUBSCRIBER, creatorFeePerSubscriber);
9871037
vm.expectEmit(true, true, true, true);
9881038
emit Asset.CreatorFeeClaimed(subscriber2, creatorFeePerSubscriber);
1039+
vm.expectEmit(true, true, true, true);
1040+
emit Asset.CreatorFeeClaimedBatch(subs, creatorFeePerSubscriber * 2);
9891041
uint256 claimed = asset.claimCreatorFee(subs);
9901042
vm.stopPrank();
9911043

@@ -1132,7 +1184,15 @@ contract AssetTest is BaseTest {
11321184
// startTime (block.timestamp) != subscription.endTime, so no in-place extension occurs.
11331185
uint256 newEnd = block.timestamp + DURATION;
11341186
vm.expectEmit(true, true, true, true);
1135-
emit Asset.SubscriptionAdded(SUBSCRIBER, block.timestamp, newEnd, 1, signer);
1187+
emit Asset.SubscriptionAdded(
1188+
SUBSCRIBER,
1189+
block.timestamp,
1190+
newEnd,
1191+
1,
1192+
signer,
1193+
SUBSCRIPTION_PRICE,
1194+
assetRegistry.getRegistryFeeShare()
1195+
);
11361196
uint256 returnedEnd = _subscribe(DURATION);
11371197

11381198
assertEq(returnedEnd, newEnd);

‎test/AssetRegistry.t.sol‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,15 @@ contract AssetRegistryTest is BaseTest {
556556
// Re-subscribe with same terms after expiry — should produce a new nonce, not extend.
557557
uint256 newEnd = block.timestamp + DURATION;
558558
vm.expectEmit(true, true, true, true);
559-
emit Asset.SubscriptionAdded(SUBSCRIBER, block.timestamp, newEnd, 1, signer);
559+
emit Asset.SubscriptionAdded(
560+
SUBSCRIBER,
561+
block.timestamp,
562+
newEnd,
563+
1,
564+
signer,
565+
SUBSCRIPTION_PRICE,
566+
assetRegistry.getRegistryFeeShare()
567+
);
560568
_subscribe(DURATION);
561569

562570
assertEq(assetRegistry.getSubscription(ASSET_ID, SUBSCRIBER), newEnd);

0 commit comments

Comments
 (0)