feat(Cellar): add support for multiple positions and multiple assets

remappings.txt

@@ -1,6 +1,7 @@
 @solmate/=lib/solmate/src/
 @forge-std/=lib/forge-std/src/
 @ds-test/=lib/forge-std/lib/ds-test/src/
+ds-test/=lib/forge-std/lib/ds-test/src/
 @openzeppelin/=lib/openzeppelin-contracts/
 @uniswap/v3-periphery/=lib/v3-periphery/
 @uniswap/v3-core/=lib/v3-core/

src/Errors.sol

@@ -144,19 +144,26 @@ error USR_ZeroRewardsPerEpoch();
  */
 error USR_InvalidLockValue(uint256 lock);
 
-/**
- * @notice Attempted to trust a position that had an incompatible underlying asset.
- * @param incompatibleAsset address of the asset is incompatible with the asset of this cellar
- * @param expectedAsset address of the cellar's underlying asset
- */
-error USR_IncompatiblePosition(address incompatibleAsset, address expectedAsset);
-
 /**
  * @notice Attempted to add a position that is already being used.
  * @param position address of the position
  */
 error USR_PositionAlreadyUsed(address position);
 
+/**
+ * @notice Attempted an action on a position that is not being used by the cellar but must be for
+ *         the operation to succeed.
+ * @param position address of the invalid position
+ */
+error USR_InvalidPosition(address position);
+
+/**
+ * @notice Attempted an action on a position that is required to be empty before the action can be performed.
+ * @param position address of the non-empty position
+ * @param sharesRemaining amount of shares remaining in the position
+ */
+error USR_PositionNotEmpty(address position, uint256 sharesRemaining);
+
 /**
  * @notice Attempted an operation with arrays of unequal lengths that were expected to be equal length.
  */
@@ -169,6 +176,13 @@ error USR_LengthMismatch();
  */
 error USR_InvalidSignature(uint256 signatureLength, uint256 expectedSignatureLength);
 
+/**
+ * @notice Attempted an operation with an asset that was different then the one expected.
+ * @param asset address of the asset
+ * @param expectedAsset address of the expected asset
+ */
+error USR_AssetMismatch(address asset, address expectedAsset);
+
 /**
  * @notice Attempted to reassign the address of a contract with an ID that has not been registered.
  * @param unregisteredId value of the ID that has not been registered