Use airdrop recipient and fee as provided by operator (#103)

Author: 0xbok

contracts/adapters/AirdropExtension.sol

@@ -61,9 +61,6 @@ contract AirdropExtension is BaseExtension {
      * @param _airdropSettings  Settings to initially the AirdropModule with
      */
     function initializeAirdropModule(IAirdropModule.AirdropSettings memory _airdropSettings) external onlyOperator {
-        _airdropSettings.feeRecipient = address(manager);
-        _airdropSettings.airdropFee = 0;
-
         invokeManager(
             address(airdropModule),
             abi.encodeWithSignature("initialize(address,(address[],address,uint256,bool))", setToken, _airdropSettings)

test/adapters/airdropExtension.spec.ts

@@ -1,7 +1,7 @@
 import "module-alias/register";
 
 import { Address, Account, AirdropSettings } from "@utils/types";
-import { ADDRESS_ZERO, MAX_UINT_256, ONE, ZERO } from "@utils/constants";
+import { ADDRESS_ZERO, MAX_UINT_256, ONE } from "@utils/constants";
 import { AirdropExtension, BaseManagerV2 } from "@utils/contracts/index";
 import { SetToken } from "@utils/contracts/setV2";
 import DeployHelper from "@utils/deploys";
@@ -134,8 +134,8 @@ describe("AirdropExtension", () => {
         subjectCaller = operator;
         subjectAirdropSettings = {
           airdrops: [setV2Setup.dai.address],
-          feeRecipient: baseManagerV2.address,
-          airdropFee: BigNumber.from(0),
+          feeRecipient: await getRandomAddress(),
+          airdropFee: BigNumber.from(12345),
           anyoneAbsorb: false,
         };
       });
@@ -172,34 +172,6 @@ describe("AirdropExtension", () => {
         expect(airdrops[0]).to.eq(setV2Setup.dai.address);
       });
 
-      context("when the fee recipient is not the manager", async () => {
-        beforeEach(async () => {
-          subjectAirdropSettings.feeRecipient = await getRandomAddress();
-        });
-
-        it("should override the fee recipient address to be the manager", async () => {
-          await subject();
-
-          const settings = await setV2Setup.airdropModule.airdropSettings(setToken.address);
-
-          expect(settings.feeRecipient).to.eq(baseManagerV2.address);
-        });
-      });
-
-      context("when the airdrop fee is nonzero", async () => {
-        beforeEach(async () => {
-          subjectAirdropSettings.airdropFee = BigNumber.from(12345);
-        });
-
-        it("should override the airdrop fee to be zero", async () => {
-          await subject();
-
-          const settings = await setV2Setup.airdropModule.airdropSettings(setToken.address);
-
-          expect(settings.airdropFee).to.eq(ZERO);
-        });
-      });
-
       context("when the operator is not the caller", async () => {
         beforeEach(async () => {
           subjectCaller = await getRandomAccount();
@@ -402,4 +374,4 @@ describe("AirdropExtension", () => {
       });
     });
   });
-});
+});