Merge remote-tracking branch 'origin/dev' into test/certora-remove-staging

QGarchery · QGarchery · commit b371b30f7bbc · 2023-02-12T18:49:59.000+01:00
diff --git a/test/TestLogarithmicBuckets.t.sol b/test/TestLogarithmicBuckets.t.sol
@@ -115,7 +115,9 @@ contract TestLogarithmicBuckets is LogarithmicBucketsMock, Test {
         assertEq(buckets.getMatch(16), accounts[0], "head equal");
         assertEq(buckets.getMatch(32), accounts[0], "head above");
     }
+}
 
+contract TestProveLogarithmicBuckets is LogarithmicBucketsMock, Test {
     function isPowerOfTwo(uint256 x) public pure returns (bool) {
         unchecked {
             return x != 0 && (x & (x - 1)) == 0;

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,9 @@ contract TestLogarithmicBuckets is LogarithmicBucketsMock, Test {`
`115`	`115`	`assertEq(buckets.getMatch(16), accounts[0], "head equal");`
`116`	`116`	`assertEq(buckets.getMatch(32), accounts[0], "head above");`
`117`	`117`	`}`
	`118`	`+}`
`118`	`119`
	`120`	`+contract TestProveLogarithmicBuckets is LogarithmicBucketsMock, Test {`
`119`	`121`	`function isPowerOfTwo(uint256 x) public pure returns (bool) {`
`120`	`122`	`unchecked {`
`121`	`123`	`return x != 0 && (x & (x - 1)) == 0;`