Skip to content

Commit 7e7e116

Browse files
committed
Remove validSets state, #getValidSets method
1 parent 2f990ea commit 7e7e116

File tree

2 files changed

+2
-58
lines changed

2 files changed

+2
-58
lines changed

contracts/factories/DelegatedManagerFactory.sol

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -81,14 +81,6 @@ contract DelegatedManagerFactory {
8181
// Mapping which stores manager creation metadata between creation and initialization steps
8282
mapping(ISetToken=>InitializeParams) public initializeState;
8383

84-
// Mapping of all Sets that have been created by this factory
85-
// NOTE: these may be pending initialization
86-
mapping(ISetToken=>bool) public isValidSet;
87-
88-
// Address array of all Sets that have been created by this factory.
89-
// NOTE: these may be pending initialization
90-
address[] internal validSets;
91-
9284
/* ============ Constructor ============ */
9385

9486
/**
@@ -255,18 +247,8 @@ contract DelegatedManagerFactory {
255247
initializeState[_setToken].manager.transferOwnership(initializeState[_setToken].owner);
256248

257249
delete initializeState[_setToken];
258-
emit DelegatedManagerInitialized(_setToken, manager);
259-
}
260-
261-
/* ============ External View Functions ============ */
262250

263-
/**
264-
* Returns list of sets that have been successfully initialized by this factory
265-
*
266-
* @return address[] List of valid sets
267-
*/
268-
function getValidSets() external view returns (address[] memory) {
269-
return validSets;
251+
emit DelegatedManagerInitialized(_setToken, manager);
270252
}
271253

272254
/* ============ Internal Functions ============ */
@@ -369,9 +351,6 @@ contract DelegatedManagerFactory {
369351
manager: IDelegatedManager(_manager),
370352
isPending: true
371353
});
372-
373-
isValidSet[_setToken] = true;
374-
validSets.push(address(_setToken));
375354
}
376355

377356

test/factories/delegatedManagerFactory.spec.ts

Lines changed: 1 addition & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -558,7 +558,7 @@ describe("DelegatedManagerFactory", () => {
558558
expect(newManager).eq(initializeParams.manager);
559559
});
560560

561-
it("should transfer ownership of DelegateManager to the `owner` specified initializeState", async () => {
561+
it("should transfer ownership of DelegatedManager to the `owner` specified initializeState", async () => {
562562
const oldOwner = await manager.owner();
563563

564564
await subject();
@@ -699,39 +699,4 @@ describe("DelegatedManagerFactory", () => {
699699
});
700700
});
701701
});
702-
703-
describe("#getValidSets", () => {
704-
let setTokenAddress: Address;
705-
706-
beforeEach(async() => {
707-
const module = setV2Setup.issuanceModule.address;
708-
const extension = mockIssuanceExtension.address;
709-
const tx = await create(module, extension);
710-
711-
setTokenAddress = await protocolUtils.getCreatedSetTokenAddress(tx.hash);
712-
713-
const initializeParams = await delegatedManagerFactory.initializeState(setTokenAddress);
714-
const initializeTargets = [module, extension];
715-
const initializeBytecode = await generateBytecode(setTokenAddress, initializeParams.manager);
716-
717-
await delegatedManagerFactory.initialize(
718-
setTokenAddress,
719-
ether(.5),
720-
await getRandomAddress(),
721-
initializeTargets,
722-
initializeBytecode
723-
);
724-
});
725-
726-
async function subject(): Promise<string[]> {
727-
return await delegatedManagerFactory.getValidSets();
728-
}
729-
730-
it("should return valid sets", async() => {
731-
const validSets = await subject();
732-
733-
expect(validSets.length).eq(1);
734-
expect(validSets.includes(setTokenAddress)).eq(true);
735-
});
736-
});
737702
});

0 commit comments

Comments
 (0)