ScopeLift
diff --git a/‎test/FlexVotingClient.t.sol‎
Lines changed: 56 additions & 140 deletions b/‎test/FlexVotingClient.t.sol‎
Lines changed: 56 additions & 140 deletions
@@ -24,167 +24,125 @@ contract BlockNumberClock_Deployment is Deployment {
   function _timestampClock() internal pure override returns (bool) {
     return false;
   }
-  function _deployClient(address _governor) internal override {
-    client = address(new MockFlexVotingClient(_governor));
-  }
-  function flexClient() public view override returns (MockFlexVotingClient) {
-    return MockFlexVotingClient(client);
+  function _deployFlexClient(address _governor) internal override {
+    flexClient = new MockFlexVotingClient(_governor);
   }
 }
 
 contract BlockNumberClock_Constructor is Constructor {
   function _timestampClock() internal pure override returns (bool) {
     return false;
   }
-  function _deployClient(address _governor) internal override {
-    client = address(new MockFlexVotingClient(_governor));
-  }
-  function flexClient() public view override returns (MockFlexVotingClient) {
-    return MockFlexVotingClient(client);
+  function _deployFlexClient(address _governor) internal override {
+    flexClient = new MockFlexVotingClient(_governor);
   }
 }
 
 contract BlockNumberClock__RawBalanceOf is _RawBalanceOf {
   function _timestampClock() internal pure override returns (bool) {
     return false;
   }
-  function _deployClient(address _governor) internal override {
-    client = address(new MockFlexVotingClient(_governor));
-  }
-  function flexClient() public view override returns (MockFlexVotingClient) {
-    return MockFlexVotingClient(client);
+  function _deployFlexClient(address _governor) internal override {
+    flexClient = new MockFlexVotingClient(_governor);
   }
 }
 
 contract BlockNumberClock__CastVoteReasonString is _CastVoteReasonString {
   function _timestampClock() internal pure override returns (bool) {
     return false;
   }
-  function _deployClient(address _governor) internal override {
-    client = address(new MockFlexVotingClient(_governor));
-  }
-  function flexClient() public view override returns (MockFlexVotingClient) {
-    return MockFlexVotingClient(client);
+  function _deployFlexClient(address _governor) internal override {
+    flexClient = new MockFlexVotingClient(_governor);
   }
 }
 
 contract BlockNumberClock__SelfDelegate is _SelfDelegate {
   function _timestampClock() internal pure override returns (bool) {
     return false;
   }
-  function _deployClient(address _governor) internal override {
-    client = address(new MockFlexVotingClient(_governor));
-  }
-  function flexClient() public view override returns (MockFlexVotingClient) {
-    return MockFlexVotingClient(client);
+  function _deployFlexClient(address _governor) internal override {
+    flexClient = new MockFlexVotingClient(_governor);
   }
 }
 
 contract BlockNumberClock__CheckpointRawBalanceOf is _CheckpointRawBalanceOf {
   function _timestampClock() internal pure override returns (bool) {
     return false;
   }
-  function _deployClient(address _governor) internal override {
-    client = address(new MockFlexVotingClient(_governor));
-  }
-  function flexClient() public view override returns (MockFlexVotingClient) {
-    return MockFlexVotingClient(client);
+  function _deployFlexClient(address _governor) internal override {
+    flexClient = new MockFlexVotingClient(_governor);
   }
 }
 
 contract BlockNumberClock_GetPastRawBalance is GetPastRawBalance {
   function _timestampClock() internal pure override returns (bool) {
     return false;
   }
-  function _deployClient(address _governor) internal override {
-    client = address(new MockFlexVotingClient(_governor));
-  }
-  function flexClient() public view override returns (MockFlexVotingClient) {
-    return MockFlexVotingClient(client);
+  function _deployFlexClient(address _governor) internal override {
+    flexClient = new MockFlexVotingClient(_governor);
   }
 }
 
 contract BlockNumber__CheckpointTotalBalance is _CheckpointTotalBalance {
   function _timestampClock() internal pure override returns (bool) {
     return false;
   }
-  function _deployClient(address _governor) internal override {
-    client = address(new MockFlexVotingClient(_governor));
-  }
-  function flexClient() public view override returns (MockFlexVotingClient) {
-    return MockFlexVotingClient(client);
+  function _deployFlexClient(address _governor) internal override {
+    flexClient = new MockFlexVotingClient(_governor);
   }
 }
 
 contract BlockNumberClock_GetPastTotalBalance is GetPastTotalBalance {
   function _timestampClock() internal pure override returns (bool) {
     return false;
   }
-  function _deployClient(address _governor) internal override {
-    client = address(new MockFlexVotingClient(_governor));
-  }
-  function flexClient() public view override returns (MockFlexVotingClient) {
-    return MockFlexVotingClient(client);
+  function _deployFlexClient(address _governor) internal override {
+    flexClient = new MockFlexVotingClient(_governor);
   }
 }
 
 contract BlockNumberClock_Withdraw is Withdraw {
   function _timestampClock() internal pure override returns (bool) {
     return false;
   }
-  function _deployClient(address _governor) internal override {
-    client = address(new MockFlexVotingClient(_governor));
-  }
-  function flexClient() public view override returns (MockFlexVotingClient) {
-    return MockFlexVotingClient(client);
+  function _deployFlexClient(address _governor) internal override {
+    flexClient = new MockFlexVotingClient(_governor);
   }
 }
 
 contract BlockNumberClock_Deposit is Deposit {
   function _timestampClock() internal pure override returns (bool) {
     return false;
   }
-  function _deployClient(address _governor) internal override {
-    client = address(new MockFlexVotingClient(_governor));
-  }
-  function flexClient() public view override returns (MockFlexVotingClient) {
-    return MockFlexVotingClient(client);
+  function _deployFlexClient(address _governor) internal override {
+    flexClient = new MockFlexVotingClient(_governor);
   }
 }
 
 contract BlockNumberClock_ExpressVote is ExpressVote {
   function _timestampClock() internal pure override returns (bool) {
     return false;
   }
-  function _deployClient(address _governor) internal override {
-    client = address(new MockFlexVotingClient(_governor));
-  }
-  function flexClient() public view override returns (MockFlexVotingClient) {
-    return MockFlexVotingClient(client);
+  function _deployFlexClient(address _governor) internal override {
+    flexClient = new MockFlexVotingClient(_governor);
   }
 }
 
 contract BlockNumberClock_CastVote is CastVote {
   function _timestampClock() internal pure override returns (bool) {
     return false;
   }
-  function _deployClient(address _governor) internal override {
-    client = address(new MockFlexVotingClient(_governor));
-  }
-  function flexClient() public view override returns (MockFlexVotingClient) {
-    return MockFlexVotingClient(client);
+  function _deployFlexClient(address _governor) internal override {
+    flexClient = new MockFlexVotingClient(_governor);
   }
 }
 
 contract BlockNumberClock_Borrow is Borrow {
   function _timestampClock() internal pure override returns (bool) {
     return false;
   }
-  function _deployClient(address _governor) internal override {
-    client = address(new MockFlexVotingClient(_governor));
-  }
-  function flexClient() public view override returns (MockFlexVotingClient) {
-    return MockFlexVotingClient(client);
+  function _deployFlexClient(address _governor) internal override {
+    flexClient = new MockFlexVotingClient(_governor);
   }
 }
 
@@ -193,166 +151,124 @@ contract TimestampClock_Deployment is Deployment {
   function _timestampClock() internal pure override returns (bool) {
     return true;
   }
-  function _deployClient(address _governor) internal override {
-    client = address(new MockFlexVotingClient(_governor));
-  }
-  function flexClient() public view override returns (MockFlexVotingClient) {
-    return MockFlexVotingClient(client);
+  function _deployFlexClient(address _governor) internal override {
+    flexClient = new MockFlexVotingClient(_governor);
   }
 }
 
 contract TimestampClock_Constructor is Constructor {
   function _timestampClock() internal pure override returns (bool) {
     return true;
   }
-  function _deployClient(address _governor) internal override {
-    client = address(new MockFlexVotingClient(_governor));
-  }
-  function flexClient() public view override returns (MockFlexVotingClient) {
-    return MockFlexVotingClient(client);
+  function _deployFlexClient(address _governor) internal override {
+    flexClient = new MockFlexVotingClient(_governor);
   }
 }
 
 contract TimestampClock__RawBalanceOf is _RawBalanceOf {
   function _timestampClock() internal pure override returns (bool) {
     return true;
   }
-  function _deployClient(address _governor) internal override {
-    client = address(new MockFlexVotingClient(_governor));
-  }
-  function flexClient() public view override returns (MockFlexVotingClient) {
-    return MockFlexVotingClient(client);
+  function _deployFlexClient(address _governor) internal override {
+    flexClient = new MockFlexVotingClient(_governor);
   }
 }
 
 contract TimestampClock__CastVoteReasonString is _CastVoteReasonString {
   function _timestampClock() internal pure override returns (bool) {
     return true;
   }
-  function _deployClient(address _governor) internal override {
-    client = address(new MockFlexVotingClient(_governor));
-  }
-  function flexClient() public view override returns (MockFlexVotingClient) {
-    return MockFlexVotingClient(client);
+  function _deployFlexClient(address _governor) internal override {
+    flexClient = new MockFlexVotingClient(_governor);
   }
 }
 
 contract TimestampClock__SelfDelegate is _SelfDelegate {
   function _timestampClock() internal pure override returns (bool) {
     return true;
   }
-  function _deployClient(address _governor) internal override {
-    client = address(new MockFlexVotingClient(_governor));
-  }
-  function flexClient() public view override returns (MockFlexVotingClient) {
-    return MockFlexVotingClient(client);
+  function _deployFlexClient(address _governor) internal override {
+    flexClient = new MockFlexVotingClient(_governor);
   }
 }
 
 contract TimestampClock__CheckpointRawBalanceOf is _CheckpointRawBalanceOf {
   function _timestampClock() internal pure override returns (bool) {
     return true;
   }
-  function _deployClient(address _governor) internal override {
-    client = address(new MockFlexVotingClient(_governor));
-  }
-  function flexClient() public view override returns (MockFlexVotingClient) {
-    return MockFlexVotingClient(client);
+  function _deployFlexClient(address _governor) internal override {
+    flexClient = new MockFlexVotingClient(_governor);
   }
 }
 
 contract TimestampClock_GetPastRawBalance is GetPastRawBalance {
   function _timestampClock() internal pure override returns (bool) {
     return true;
   }
-  function _deployClient(address _governor) internal override {
-    client = address(new MockFlexVotingClient(_governor));
-  }
-  function flexClient() public view override returns (MockFlexVotingClient) {
-    return MockFlexVotingClient(client);
+  function _deployFlexClient(address _governor) internal override {
+    flexClient = new MockFlexVotingClient(_governor);
   }
 }
 
 contract TimestampClock__CheckpointTotalBalance is _CheckpointTotalBalance {
   function _timestampClock() internal pure override returns (bool) {
     return true;
   }
-  function _deployClient(address _governor) internal override {
-    client = address(new MockFlexVotingClient(_governor));
-  }
-  function flexClient() public view override returns (MockFlexVotingClient) {
-    return MockFlexVotingClient(client);
+  function _deployFlexClient(address _governor) internal override {
+    flexClient = new MockFlexVotingClient(_governor);
   }
 }
 
 contract TimestampClock_GetPastTotalBalance is GetPastTotalBalance {
   function _timestampClock() internal pure override returns (bool) {
     return true;
   }
-  function _deployClient(address _governor) internal override {
-    client = address(new MockFlexVotingClient(_governor));
-  }
-  function flexClient() public view override returns (MockFlexVotingClient) {
-    return MockFlexVotingClient(client);
+  function _deployFlexClient(address _governor) internal override {
+    flexClient = new MockFlexVotingClient(_governor);
   }
 }
 
 contract TimestampClock_Withdraw is Withdraw {
   function _timestampClock() internal pure override returns (bool) {
     return true;
   }
-  function _deployClient(address _governor) internal override {
-    client = address(new MockFlexVotingClient(_governor));
-  }
-  function flexClient() public view override returns (MockFlexVotingClient) {
-    return MockFlexVotingClient(client);
+  function _deployFlexClient(address _governor) internal override {
+    flexClient = new MockFlexVotingClient(_governor);
   }
 }
 
 contract TimestampClock_Deposit is Deposit {
   function _timestampClock() internal pure override returns (bool) {
     return true;
   }
-  function _deployClient(address _governor) internal override {
-    client = address(new MockFlexVotingClient(_governor));
-  }
-  function flexClient() public view override returns (MockFlexVotingClient) {
-    return MockFlexVotingClient(client);
+  function _deployFlexClient(address _governor) internal override {
+    flexClient = new MockFlexVotingClient(_governor);
   }
 }
 
 contract TimestampClock_ExpressVote is ExpressVote {
   function _timestampClock() internal pure override returns (bool) {
     return true;
   }
-  function _deployClient(address _governor) internal override {
-    client = address(new MockFlexVotingClient(_governor));
-  }
-  function flexClient() public view override returns (MockFlexVotingClient) {
-    return MockFlexVotingClient(client);
+  function _deployFlexClient(address _governor) internal override {
+    flexClient = new MockFlexVotingClient(_governor);
   }
 }
 
 contract TimestampClock_CastVote is CastVote {
   function _timestampClock() internal pure override returns (bool) {
     return true;
   }
-  function _deployClient(address _governor) internal override {
-    client = address(new MockFlexVotingClient(_governor));
-  }
-  function flexClient() public view override returns (MockFlexVotingClient) {
-    return MockFlexVotingClient(client);
+  function _deployFlexClient(address _governor) internal override {
+    flexClient = new MockFlexVotingClient(_governor);
   }
 }
 
 contract TimestampClock_Borrow is Borrow {
   function _timestampClock() internal pure override returns (bool) {
     return true;
   }
-  function _deployClient(address _governor) internal override {
-    client = address(new MockFlexVotingClient(_governor));
-  }
-  function flexClient() public view override returns (MockFlexVotingClient) {
-    return MockFlexVotingClient(client);
+  function _deployFlexClient(address _governor) internal override {
+    flexClient = new MockFlexVotingClient(_governor);
   }
 }
Original file line number	Diff line number	Diff line change
`@@ -24,167 +24,125 @@ contract BlockNumberClock_Deployment is Deployment {`
`24`	`24`	`function _timestampClock() internal pure override returns (bool) {`
`25`	`25`	`return false;`
`26`	`26`	`}`
`27`		`- function _deployClient(address _governor) internal override {`
`28`		`- client = address(new MockFlexVotingClient(_governor));`
`29`		`- }`
`30`		`- function flexClient() public view override returns (MockFlexVotingClient) {`
`31`		`- return MockFlexVotingClient(client);`
	`27`	`+ function _deployFlexClient(address _governor) internal override {`
	`28`	`+ flexClient = new MockFlexVotingClient(_governor);`
`32`	`29`	`}`
`33`	`30`	`}`
`34`	`31`
`35`	`32`	`contract BlockNumberClock_Constructor is Constructor {`
`36`	`33`	`function _timestampClock() internal pure override returns (bool) {`
`37`	`34`	`return false;`
`38`	`35`	`}`
`39`		`- function _deployClient(address _governor) internal override {`
`40`		`- client = address(new MockFlexVotingClient(_governor));`
`41`		`- }`
`42`		`- function flexClient() public view override returns (MockFlexVotingClient) {`
`43`		`- return MockFlexVotingClient(client);`
	`36`	`+ function _deployFlexClient(address _governor) internal override {`
	`37`	`+ flexClient = new MockFlexVotingClient(_governor);`
`44`	`38`	`}`
`45`	`39`	`}`
`46`	`40`
`47`	`41`	`contract BlockNumberClock__RawBalanceOf is _RawBalanceOf {`
`48`	`42`	`function _timestampClock() internal pure override returns (bool) {`
`49`	`43`	`return false;`
`50`	`44`	`}`
`51`		`- function _deployClient(address _governor) internal override {`
`52`		`- client = address(new MockFlexVotingClient(_governor));`
`53`		`- }`
`54`		`- function flexClient() public view override returns (MockFlexVotingClient) {`
`55`		`- return MockFlexVotingClient(client);`
	`45`	`+ function _deployFlexClient(address _governor) internal override {`
	`46`	`+ flexClient = new MockFlexVotingClient(_governor);`
`56`	`47`	`}`
`57`	`48`	`}`
`58`	`49`
`59`	`50`	`contract BlockNumberClock__CastVoteReasonString is _CastVoteReasonString {`
`60`	`51`	`function _timestampClock() internal pure override returns (bool) {`
`61`	`52`	`return false;`
`62`	`53`	`}`
`63`		`- function _deployClient(address _governor) internal override {`
`64`		`- client = address(new MockFlexVotingClient(_governor));`
`65`		`- }`
`66`		`- function flexClient() public view override returns (MockFlexVotingClient) {`
`67`		`- return MockFlexVotingClient(client);`
	`54`	`+ function _deployFlexClient(address _governor) internal override {`
	`55`	`+ flexClient = new MockFlexVotingClient(_governor);`
`68`	`56`	`}`
`69`	`57`	`}`
`70`	`58`
`71`	`59`	`contract BlockNumberClock__SelfDelegate is _SelfDelegate {`
`72`	`60`	`function _timestampClock() internal pure override returns (bool) {`
`73`	`61`	`return false;`
`74`	`62`	`}`
`75`		`- function _deployClient(address _governor) internal override {`
`76`		`- client = address(new MockFlexVotingClient(_governor));`
`77`		`- }`
`78`		`- function flexClient() public view override returns (MockFlexVotingClient) {`
`79`		`- return MockFlexVotingClient(client);`
	`63`	`+ function _deployFlexClient(address _governor) internal override {`
	`64`	`+ flexClient = new MockFlexVotingClient(_governor);`
`80`	`65`	`}`
`81`	`66`	`}`
`82`	`67`
`83`	`68`	`contract BlockNumberClock__CheckpointRawBalanceOf is _CheckpointRawBalanceOf {`
`84`	`69`	`function _timestampClock() internal pure override returns (bool) {`
`85`	`70`	`return false;`
`86`	`71`	`}`
`87`		`- function _deployClient(address _governor) internal override {`
`88`		`- client = address(new MockFlexVotingClient(_governor));`
`89`		`- }`
`90`		`- function flexClient() public view override returns (MockFlexVotingClient) {`
`91`		`- return MockFlexVotingClient(client);`
	`72`	`+ function _deployFlexClient(address _governor) internal override {`
	`73`	`+ flexClient = new MockFlexVotingClient(_governor);`
`92`	`74`	`}`
`93`	`75`	`}`
`94`	`76`
`95`	`77`	`contract BlockNumberClock_GetPastRawBalance is GetPastRawBalance {`
`96`	`78`	`function _timestampClock() internal pure override returns (bool) {`
`97`	`79`	`return false;`
`98`	`80`	`}`
`99`		`- function _deployClient(address _governor) internal override {`
`100`		`- client = address(new MockFlexVotingClient(_governor));`
`101`		`- }`
`102`		`- function flexClient() public view override returns (MockFlexVotingClient) {`
`103`		`- return MockFlexVotingClient(client);`
	`81`	`+ function _deployFlexClient(address _governor) internal override {`
	`82`	`+ flexClient = new MockFlexVotingClient(_governor);`
`104`	`83`	`}`
`105`	`84`	`}`
`106`	`85`
`107`	`86`	`contract BlockNumber__CheckpointTotalBalance is _CheckpointTotalBalance {`
`108`	`87`	`function _timestampClock() internal pure override returns (bool) {`
`109`	`88`	`return false;`
`110`	`89`	`}`
`111`		`- function _deployClient(address _governor) internal override {`
`112`		`- client = address(new MockFlexVotingClient(_governor));`
`113`		`- }`
`114`		`- function flexClient() public view override returns (MockFlexVotingClient) {`
`115`		`- return MockFlexVotingClient(client);`
	`90`	`+ function _deployFlexClient(address _governor) internal override {`
	`91`	`+ flexClient = new MockFlexVotingClient(_governor);`
`116`	`92`	`}`
`117`	`93`	`}`
`118`	`94`
`119`	`95`	`contract BlockNumberClock_GetPastTotalBalance is GetPastTotalBalance {`
`120`	`96`	`function _timestampClock() internal pure override returns (bool) {`
`121`	`97`	`return false;`
`122`	`98`	`}`
`123`		`- function _deployClient(address _governor) internal override {`
`124`		`- client = address(new MockFlexVotingClient(_governor));`
`125`		`- }`
`126`		`- function flexClient() public view override returns (MockFlexVotingClient) {`
`127`		`- return MockFlexVotingClient(client);`
	`99`	`+ function _deployFlexClient(address _governor) internal override {`
	`100`	`+ flexClient = new MockFlexVotingClient(_governor);`
`128`	`101`	`}`
`129`	`102`	`}`
`130`	`103`
`131`	`104`	`contract BlockNumberClock_Withdraw is Withdraw {`
`132`	`105`	`function _timestampClock() internal pure override returns (bool) {`
`133`	`106`	`return false;`
`134`	`107`	`}`
`135`		`- function _deployClient(address _governor) internal override {`
`136`		`- client = address(new MockFlexVotingClient(_governor));`
`137`		`- }`
`138`		`- function flexClient() public view override returns (MockFlexVotingClient) {`
`139`		`- return MockFlexVotingClient(client);`
	`108`	`+ function _deployFlexClient(address _governor) internal override {`
	`109`	`+ flexClient = new MockFlexVotingClient(_governor);`
`140`	`110`	`}`
`141`	`111`	`}`
`142`	`112`
`143`	`113`	`contract BlockNumberClock_Deposit is Deposit {`
`144`	`114`	`function _timestampClock() internal pure override returns (bool) {`
`145`	`115`	`return false;`
`146`	`116`	`}`
`147`		`- function _deployClient(address _governor) internal override {`
`148`		`- client = address(new MockFlexVotingClient(_governor));`
`149`		`- }`
`150`		`- function flexClient() public view override returns (MockFlexVotingClient) {`
`151`		`- return MockFlexVotingClient(client);`
	`117`	`+ function _deployFlexClient(address _governor) internal override {`
	`118`	`+ flexClient = new MockFlexVotingClient(_governor);`
`152`	`119`	`}`
`153`	`120`	`}`
`154`	`121`
`155`	`122`	`contract BlockNumberClock_ExpressVote is ExpressVote {`
`156`	`123`	`function _timestampClock() internal pure override returns (bool) {`
`157`	`124`	`return false;`
`158`	`125`	`}`
`159`		`- function _deployClient(address _governor) internal override {`
`160`		`- client = address(new MockFlexVotingClient(_governor));`
`161`		`- }`
`162`		`- function flexClient() public view override returns (MockFlexVotingClient) {`
`163`		`- return MockFlexVotingClient(client);`
	`126`	`+ function _deployFlexClient(address _governor) internal override {`
	`127`	`+ flexClient = new MockFlexVotingClient(_governor);`
`164`	`128`	`}`
`165`	`129`	`}`
`166`	`130`
`167`	`131`	`contract BlockNumberClock_CastVote is CastVote {`
`168`	`132`	`function _timestampClock() internal pure override returns (bool) {`
`169`	`133`	`return false;`
`170`	`134`	`}`
`171`		`- function _deployClient(address _governor) internal override {`
`172`		`- client = address(new MockFlexVotingClient(_governor));`
`173`		`- }`
`174`		`- function flexClient() public view override returns (MockFlexVotingClient) {`
`175`		`- return MockFlexVotingClient(client);`
	`135`	`+ function _deployFlexClient(address _governor) internal override {`
	`136`	`+ flexClient = new MockFlexVotingClient(_governor);`
`176`	`137`	`}`
`177`	`138`	`}`
`178`	`139`
`179`	`140`	`contract BlockNumberClock_Borrow is Borrow {`
`180`	`141`	`function _timestampClock() internal pure override returns (bool) {`
`181`	`142`	`return false;`
`182`	`143`	`}`
`183`		`- function _deployClient(address _governor) internal override {`
`184`		`- client = address(new MockFlexVotingClient(_governor));`
`185`		`- }`
`186`		`- function flexClient() public view override returns (MockFlexVotingClient) {`
`187`		`- return MockFlexVotingClient(client);`
	`144`	`+ function _deployFlexClient(address _governor) internal override {`
	`145`	`+ flexClient = new MockFlexVotingClient(_governor);`
`188`	`146`	`}`
`189`	`147`	`}`
`190`	`148`
`@@ -193,166 +151,124 @@ contract TimestampClock_Deployment is Deployment {`
`193`	`151`	`function _timestampClock() internal pure override returns (bool) {`
`194`	`152`	`return true;`
`195`	`153`	`}`
`196`		`- function _deployClient(address _governor) internal override {`
`197`		`- client = address(new MockFlexVotingClient(_governor));`
`198`		`- }`
`199`		`- function flexClient() public view override returns (MockFlexVotingClient) {`
`200`		`- return MockFlexVotingClient(client);`
	`154`	`+ function _deployFlexClient(address _governor) internal override {`
	`155`	`+ flexClient = new MockFlexVotingClient(_governor);`
`201`	`156`	`}`
`202`	`157`	`}`
`203`	`158`
`204`	`159`	`contract TimestampClock_Constructor is Constructor {`
`205`	`160`	`function _timestampClock() internal pure override returns (bool) {`
`206`	`161`	`return true;`
`207`	`162`	`}`
`208`		`- function _deployClient(address _governor) internal override {`
`209`		`- client = address(new MockFlexVotingClient(_governor));`
`210`		`- }`
`211`		`- function flexClient() public view override returns (MockFlexVotingClient) {`
`212`		`- return MockFlexVotingClient(client);`
	`163`	`+ function _deployFlexClient(address _governor) internal override {`
	`164`	`+ flexClient = new MockFlexVotingClient(_governor);`
`213`	`165`	`}`
`214`	`166`	`}`
`215`	`167`
`216`	`168`	`contract TimestampClock__RawBalanceOf is _RawBalanceOf {`
`217`	`169`	`function _timestampClock() internal pure override returns (bool) {`
`218`	`170`	`return true;`
`219`	`171`	`}`
`220`		`- function _deployClient(address _governor) internal override {`
`221`		`- client = address(new MockFlexVotingClient(_governor));`
`222`		`- }`
`223`		`- function flexClient() public view override returns (MockFlexVotingClient) {`
`224`		`- return MockFlexVotingClient(client);`
	`172`	`+ function _deployFlexClient(address _governor) internal override {`
	`173`	`+ flexClient = new MockFlexVotingClient(_governor);`
`225`	`174`	`}`
`226`	`175`	`}`
`227`	`176`
`228`	`177`	`contract TimestampClock__CastVoteReasonString is _CastVoteReasonString {`
`229`	`178`	`function _timestampClock() internal pure override returns (bool) {`
`230`	`179`	`return true;`
`231`	`180`	`}`
`232`		`- function _deployClient(address _governor) internal override {`
`233`		`- client = address(new MockFlexVotingClient(_governor));`
`234`		`- }`
`235`		`- function flexClient() public view override returns (MockFlexVotingClient) {`
`236`		`- return MockFlexVotingClient(client);`
	`181`	`+ function _deployFlexClient(address _governor) internal override {`
	`182`	`+ flexClient = new MockFlexVotingClient(_governor);`
`237`	`183`	`}`
`238`	`184`	`}`
`239`	`185`
`240`	`186`	`contract TimestampClock__SelfDelegate is _SelfDelegate {`
`241`	`187`	`function _timestampClock() internal pure override returns (bool) {`
`242`	`188`	`return true;`
`243`	`189`	`}`
`244`		`- function _deployClient(address _governor) internal override {`
`245`		`- client = address(new MockFlexVotingClient(_governor));`
`246`		`- }`
`247`		`- function flexClient() public view override returns (MockFlexVotingClient) {`
`248`		`- return MockFlexVotingClient(client);`
	`190`	`+ function _deployFlexClient(address _governor) internal override {`
	`191`	`+ flexClient = new MockFlexVotingClient(_governor);`
`249`	`192`	`}`
`250`	`193`	`}`
`251`	`194`
`252`	`195`	`contract TimestampClock__CheckpointRawBalanceOf is _CheckpointRawBalanceOf {`
`253`	`196`	`function _timestampClock() internal pure override returns (bool) {`
`254`	`197`	`return true;`
`255`	`198`	`}`
`256`		`- function _deployClient(address _governor) internal override {`
`257`		`- client = address(new MockFlexVotingClient(_governor));`
`258`		`- }`
`259`		`- function flexClient() public view override returns (MockFlexVotingClient) {`
`260`		`- return MockFlexVotingClient(client);`
	`199`	`+ function _deployFlexClient(address _governor) internal override {`
	`200`	`+ flexClient = new MockFlexVotingClient(_governor);`
`261`	`201`	`}`
`262`	`202`	`}`
`263`	`203`
`264`	`204`	`contract TimestampClock_GetPastRawBalance is GetPastRawBalance {`
`265`	`205`	`function _timestampClock() internal pure override returns (bool) {`
`266`	`206`	`return true;`
`267`	`207`	`}`
`268`		`- function _deployClient(address _governor) internal override {`
`269`		`- client = address(new MockFlexVotingClient(_governor));`
`270`		`- }`
`271`		`- function flexClient() public view override returns (MockFlexVotingClient) {`
`272`		`- return MockFlexVotingClient(client);`
	`208`	`+ function _deployFlexClient(address _governor) internal override {`
	`209`	`+ flexClient = new MockFlexVotingClient(_governor);`
`273`	`210`	`}`
`274`	`211`	`}`
`275`	`212`
`276`	`213`	`contract TimestampClock__CheckpointTotalBalance is _CheckpointTotalBalance {`
`277`	`214`	`function _timestampClock() internal pure override returns (bool) {`
`278`	`215`	`return true;`
`279`	`216`	`}`
`280`		`- function _deployClient(address _governor) internal override {`
`281`		`- client = address(new MockFlexVotingClient(_governor));`
`282`		`- }`
`283`		`- function flexClient() public view override returns (MockFlexVotingClient) {`
`284`		`- return MockFlexVotingClient(client);`
	`217`	`+ function _deployFlexClient(address _governor) internal override {`
	`218`	`+ flexClient = new MockFlexVotingClient(_governor);`
`285`	`219`	`}`
`286`	`220`	`}`
`287`	`221`
`288`	`222`	`contract TimestampClock_GetPastTotalBalance is GetPastTotalBalance {`
`289`	`223`	`function _timestampClock() internal pure override returns (bool) {`
`290`	`224`	`return true;`
`291`	`225`	`}`
`292`		`- function _deployClient(address _governor) internal override {`
`293`		`- client = address(new MockFlexVotingClient(_governor));`
`294`		`- }`
`295`		`- function flexClient() public view override returns (MockFlexVotingClient) {`
`296`		`- return MockFlexVotingClient(client);`
	`226`	`+ function _deployFlexClient(address _governor) internal override {`
	`227`	`+ flexClient = new MockFlexVotingClient(_governor);`
`297`	`228`	`}`
`298`	`229`	`}`
`299`	`230`
`300`	`231`	`contract TimestampClock_Withdraw is Withdraw {`
`301`	`232`	`function _timestampClock() internal pure override returns (bool) {`
`302`	`233`	`return true;`
`303`	`234`	`}`
`304`		`- function _deployClient(address _governor) internal override {`
`305`		`- client = address(new MockFlexVotingClient(_governor));`
`306`		`- }`
`307`		`- function flexClient() public view override returns (MockFlexVotingClient) {`
`308`		`- return MockFlexVotingClient(client);`
	`235`	`+ function _deployFlexClient(address _governor) internal override {`
	`236`	`+ flexClient = new MockFlexVotingClient(_governor);`
`309`	`237`	`}`
`310`	`238`	`}`
`311`	`239`
`312`	`240`	`contract TimestampClock_Deposit is Deposit {`
`313`	`241`	`function _timestampClock() internal pure override returns (bool) {`
`314`	`242`	`return true;`
`315`	`243`	`}`
`316`		`- function _deployClient(address _governor) internal override {`
`317`		`- client = address(new MockFlexVotingClient(_governor));`
`318`		`- }`
`319`		`- function flexClient() public view override returns (MockFlexVotingClient) {`
`320`		`- return MockFlexVotingClient(client);`
	`244`	`+ function _deployFlexClient(address _governor) internal override {`
	`245`	`+ flexClient = new MockFlexVotingClient(_governor);`
`321`	`246`	`}`
`322`	`247`	`}`
`323`	`248`
`324`	`249`	`contract TimestampClock_ExpressVote is ExpressVote {`
`325`	`250`	`function _timestampClock() internal pure override returns (bool) {`
`326`	`251`	`return true;`
`327`	`252`	`}`
`328`		`- function _deployClient(address _governor) internal override {`
`329`		`- client = address(new MockFlexVotingClient(_governor));`
`330`		`- }`
`331`		`- function flexClient() public view override returns (MockFlexVotingClient) {`
`332`		`- return MockFlexVotingClient(client);`
	`253`	`+ function _deployFlexClient(address _governor) internal override {`
	`254`	`+ flexClient = new MockFlexVotingClient(_governor);`
`333`	`255`	`}`
`334`	`256`	`}`
`335`	`257`
`336`	`258`	`contract TimestampClock_CastVote is CastVote {`
`337`	`259`	`function _timestampClock() internal pure override returns (bool) {`
`338`	`260`	`return true;`
`339`	`261`	`}`
`340`		`- function _deployClient(address _governor) internal override {`
`341`		`- client = address(new MockFlexVotingClient(_governor));`
`342`		`- }`
`343`		`- function flexClient() public view override returns (MockFlexVotingClient) {`
`344`		`- return MockFlexVotingClient(client);`
	`262`	`+ function _deployFlexClient(address _governor) internal override {`
	`263`	`+ flexClient = new MockFlexVotingClient(_governor);`
`345`	`264`	`}`
`346`	`265`	`}`
`347`	`266`
`348`	`267`	`contract TimestampClock_Borrow is Borrow {`
`349`	`268`	`function _timestampClock() internal pure override returns (bool) {`
`350`	`269`	`return true;`
`351`	`270`	`}`
`352`		`- function _deployClient(address _governor) internal override {`
`353`		`- client = address(new MockFlexVotingClient(_governor));`
`354`		`- }`
`355`		`- function flexClient() public view override returns (MockFlexVotingClient) {`
`356`		`- return MockFlexVotingClient(client);`
	`271`	`+ function _deployFlexClient(address _governor) internal override {`
	`272`	`+ flexClient = new MockFlexVotingClient(_governor);`
`357`	`273`	`}`
`358`	`274`	`}`