refactor outputs

aragon · Aug 30, 2023 · fd92edd · fd92edd
1 parent 3ea46e1
commit fd92edd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 15 deletions.
diff --git a/subgraph/src/ids/pluginRepo.ts b/subgraph/src/ids/pluginRepo.ts
@@ -37,12 +37,11 @@ export function getPluginSetupId(pluginSetup: Address): string {
 export function getPluginInstallationId(
   dao: Address,
   plugin: Address
-): Bytes | null {
-  let installationIdTupleArray = new ethereum.Tuple();
-  installationIdTupleArray.push(ethereum.Value.fromAddress(dao));
-  installationIdTupleArray.push(ethereum.Value.fromAddress(plugin));
+): string | null {
+  let installationIdTuple = new ethereum.Tuple();
+  installationIdTuple.push(ethereum.Value.fromAddress(dao));
+  installationIdTuple.push(ethereum.Value.fromAddress(plugin));
 
-  let installationIdTuple = installationIdTupleArray as ethereum.Tuple;
   let installationIdTupleEncoded = ethereum.encode(
     ethereum.Value.fromTuple(installationIdTuple)
   );
@@ -54,7 +53,7 @@ export function getPluginInstallationId(
           ByteArray.fromHexString(installationIdTupleEncoded.toHexString())
         )
         .toHexString()
-    );
+    ).toHexString();
   }
   return null;
 }
@@ -68,13 +67,10 @@ export function getPluginInstallationId(
  * @returns A concatenated ID string for plugin preparation.
  */
 export function getPluginPreparationId(
-  pluginInstallationId: Bytes,
+  pluginInstallationId: string,
   prepareSetupId: Bytes
 ): string {
-  const ids = [
-    pluginInstallationId.toHexString(),
-    prepareSetupId.toHexString()
-  ];
+  const ids = [pluginInstallationId, prepareSetupId.toHexString()];
   return ids.join('_');
 }
 

diff --git a/subgraph/tests/ids/pluginRepo.test.ts b/subgraph/tests/ids/pluginRepo.test.ts
@@ -50,9 +50,9 @@ describe('PluginRepo ID generation', () => {
 
       const expectedId = Bytes.fromHexString(
         crypto.keccak256(expectedEncodedBytes).toHexString()
-      );
+      ).toHexString();
 
-      assert.bytesEquals(pluginInstallationId, expectedId);
+      assert.stringEquals(pluginInstallationId, expectedId);
 
       // The test is done.
       return;
@@ -83,7 +83,7 @@ describe('PluginRepo ID generation', () => {
       );
 
       // Expected result
-      const expectedPreparationId = `${pluginInstallationId.toHexString()}_${DUMMY_BYTES32_HEX}`;
+      const expectedPreparationId = `${pluginInstallationId}_${DUMMY_BYTES32_HEX}`;
 
       assert.stringEquals(pluginPreparationId, expectedPreparationId);
 
@@ -136,7 +136,7 @@ describe('PluginRepo ID generation', () => {
     const WHO_ADDRESS = Address.fromString(ADDRESS_TWO);
     const PERMISSION_ID = Bytes.fromHexString(DUMMY_BYTES32_HEX);
     const PLUGIN_PREPARATION_ID = getPluginPreparationId(
-      Bytes.fromHexString(DUMMY_BYTES32_HEX),
+      DUMMY_BYTES32_HEX,
       Bytes.fromHexString(DUMMY_BYTES32_HEX)
     );