fix tests

latticexyz · Sep 17, 2023 · 7920196 · 7920196
1 parent 2c1e155
commit 7920196
Show file tree

Hide file tree

Showing 4 changed files with 174 additions and 73 deletions.
diff --git a/packages/store/src/StoreCore.sol b/packages/store/src/StoreCore.sol
@@ -761,7 +761,7 @@ library StoreCoreInternal {
     // Store the provided value in storage
     {
       uint256 dynamicDataLocation = _getDynamicDataLocation(tableId, keyTuple, dynamicFieldIndex);
-      Storage.store({ storagePointer: dynamicDataLocation, offset: start, data: data });
+      Storage.store({ storagePointer: dynamicDataLocation, offset: startWithinField, data: data });
     }
 
     // Call onAfterSpliceDynamicData hooks

diff --git a/packages/store/test/EchoSubscriber.sol b/packages/store/test/EchoSubscriber.sol
@@ -16,7 +16,9 @@ contract EchoSubscriber is StoreHook {
     bytes memory dynamicData,
     FieldLayout fieldLayout
   ) public {
-    emit HookCalled(abi.encode(tableId, keyTuple, staticData, encodedLengths, dynamicData, fieldLayout));
+    emit HookCalled(
+      abi.encodeCall(this.onBeforeSetRecord, (tableId, keyTuple, staticData, encodedLengths, dynamicData, fieldLayout))
+    );
   }
 
   function onAfterSetRecord(
@@ -27,62 +29,70 @@ contract EchoSubscriber is StoreHook {
     bytes memory dynamicData,
     FieldLayout fieldLayout
   ) public {
-    emit HookCalled(abi.encode(tableId, keyTuple, staticData, encodedLengths, dynamicData, fieldLayout));
+    emit HookCalled(
+      abi.encodeCall(this.onAfterSetRecord, (tableId, keyTuple, staticData, encodedLengths, dynamicData, fieldLayout))
+    );
   }
 
   function onBeforeSpliceStaticData(
     bytes32 tableId,
-    bytes32[] calldata keyTuple,
+    bytes32[] memory keyTuple,
     uint48 start,
     uint40 deleteCount,
-    bytes calldata data
+    bytes memory data
   ) public {
-    emit HookCalled(abi.encode(tableId, keyTuple, start, deleteCount, data));
+    emit HookCalled(abi.encodeCall(this.onBeforeSpliceStaticData, (tableId, keyTuple, start, deleteCount, data)));
   }
 
   function onAfterSpliceStaticData(
     bytes32 tableId,
-    bytes32[] calldata keyTuple,
+    bytes32[] memory keyTuple,
     uint48 start,
     uint40 deleteCount,
-    bytes calldata data
+    bytes memory data
   ) public {
-    emit HookCalled(abi.encode(tableId, keyTuple, start, deleteCount, data));
+    emit HookCalled(abi.encodeCall(this.onAfterSpliceStaticData, (tableId, keyTuple, start, deleteCount, data)));
   }
 
   function onBeforeSpliceDynamicData(
     bytes32 tableId,
-    bytes32[] calldata keyTuple,
+    bytes32[] memory keyTuple,
     uint8 dynamicFieldIndex,
     uint40 startWithinField,
     uint40 deleteCount,
-    bytes calldata data,
+    bytes memory data,
     PackedCounter encodedLengths
   ) public {
     emit HookCalled(
-      abi.encode(tableId, keyTuple, dynamicFieldIndex, startWithinField, deleteCount, data, encodedLengths.unwrap())
+      abi.encodeCall(
+        this.onBeforeSpliceDynamicData,
+        (tableId, keyTuple, dynamicFieldIndex, startWithinField, deleteCount, data, encodedLengths)
+      )
     );
   }
 
   function onAfterSpliceDynamicData(
     bytes32 tableId,
-    bytes32[] calldata keyTuple,
+    bytes32[] memory keyTuple,
     uint8 dynamicFieldIndex,
     uint40 startWithinField,
     uint40 deleteCount,
-    bytes calldata data,
+    bytes memory data,
     PackedCounter encodedLengths
   ) public {
     emit HookCalled(
-      abi.encode(tableId, keyTuple, dynamicFieldIndex, startWithinField, deleteCount, data, encodedLengths.unwrap())
+      abi.encodeCall(
+        this.onAfterSpliceDynamicData,
+        (tableId, keyTuple, dynamicFieldIndex, startWithinField, deleteCount, data, encodedLengths)
+      )
     );
   }
 
   function onBeforeDeleteRecord(bytes32 tableId, bytes32[] memory keyTuple, FieldLayout fieldLayout) public {
-    emit HookCalled(abi.encode(tableId, keyTuple, fieldLayout));
+    emit HookCalled(abi.encodeCall(this.onBeforeDeleteRecord, (tableId, keyTuple, fieldLayout)));
   }
 
   function onAfterDeleteRecord(bytes32 tableId, bytes32[] memory keyTuple, FieldLayout fieldLayout) public {
-    emit HookCalled(abi.encode(tableId, keyTuple, fieldLayout));
+    emit HookCalled(abi.encodeCall(this.onAfterDeleteRecord, (tableId, keyTuple, fieldLayout)));
   }
 }