coverage

Author: Amxx

contracts/utils/Bytes.sol

@@ -79,12 +79,15 @@ library Bytes {
      * @dev Count number of occurrences of `search` in `buffer`, starting from position `offset`.
      */
     function countConsecutive(bytes memory buffer, uint256 offset, bytes1 search) internal pure returns (uint256 i) {
+        uint256 length = buffer.length;
+        if (offset > length) return 0;
+
         assembly ("memory-safe") {
             let chunk
-            let length := sub(mload(buffer), offset)
+            let end := sub(length, offset)
             for {
                 i := 0
-            } lt(i, length) {
+            } lt(i, end) {
                 i := add(i, 1)
             } {
                 // every 32 bytes, load a new chunk

test/utils/Base58.test.js

@@ -20,8 +20,8 @@ describe('Base58', function () {
           const hex = ethers.hexlify(buffer);
           const b58 = ethers.encodeBase58(buffer);
 
-          expect(await this.mock.$encode(hex)).to.equal(b58);
-          expect(await this.mock.$decode(b58)).to.equal(hex);
+          await expect(this.mock.$encode(hex)).to.eventually.equal(b58);
+          await expect(this.mock.$decode(b58)).to.eventually.equal(hex);
         });
     });
 

test/utils/Base64.test.js

@@ -27,8 +27,8 @@ describe('Base64', function () {
     ])
       it(title, async function () {
         const buffer = Buffer.from(input, 'ascii');
-        expect(await this.mock.$encode(buffer)).to.equal(ethers.encodeBase64(buffer));
-        expect(await this.mock.$encode(buffer)).to.equal(expected);
+        await expect(this.mock.$encode(buffer)).to.eventually.equal(ethers.encodeBase64(buffer));
+        await expect(this.mock.$encode(buffer)).to.eventually.equal(expected);
       });
   });
 
@@ -43,8 +43,8 @@ describe('Base64', function () {
     ])
       it(title, async function () {
         const buffer = Buffer.from(input, 'ascii');
-        expect(await this.mock.$encodeURL(buffer)).to.equal(base64toBase64Url(ethers.encodeBase64(buffer)));
-        expect(await this.mock.$encodeURL(buffer)).to.equal(expected);
+        await expect(this.mock.$encodeURL(buffer)).to.eventually.equal(base64toBase64Url(ethers.encodeBase64(buffer)));
+        await expect(this.mock.$encodeURL(buffer)).to.eventually.equal(expected);
       });
   });
 
@@ -53,7 +53,7 @@ describe('Base64', function () {
     const buffer32 = ethers.id('example');
     const buffer31 = buffer32.slice(0, -2);
 
-    expect(await mock.encode(buffer31)).to.equal(ethers.encodeBase64(buffer31));
-    expect(await mock.encode(buffer32)).to.equal(ethers.encodeBase64(buffer32));
+    await expect(mock.encode(buffer31)).to.eventually.equal(ethers.encodeBase64(buffer31));
+    await expect(mock.encode(buffer32)).to.eventually.equal(ethers.encodeBase64(buffer32));
   });
 });

test/utils/Bytes.test.js

@@ -56,6 +56,35 @@ describe('Bytes', function () {
     });
   });
 
+  describe('countConsecutive', function () {
+    it('empty buffer', async function () {
+      await expect(this.mock.$countConsecutive('0x', 0, '0x00')).to.eventually.equal(0);
+    });
+
+    it('no occurrence', async function () {
+      await expect(this.mock.$countConsecutive('0xa4f678', 0, '0x00')).to.eventually.equal(0);
+      await expect(this.mock.$countConsecutive('0x000000', 0, '0x01')).to.eventually.equal(0);
+    });
+
+    it('single occurrence', async function () {
+      await expect(this.mock.$countConsecutive('0xa4f678', 0, '0xa4')).to.eventually.equal(1);
+      await expect(this.mock.$countConsecutive('0xa4f678', 1, '0xf6')).to.eventually.equal(1);
+      await expect(this.mock.$countConsecutive('0xa4f678', 2, '0x78')).to.eventually.equal(1);
+    });
+
+    it('multiple occurrence', async function () {
+      await expect(this.mock.$countConsecutive('0xa4a4f6f6f6f678', 0, '0xa4')).to.eventually.equal(2);
+      await expect(this.mock.$countConsecutive('0xa4a4f6f6f6f678', 2, '0xf6')).to.eventually.equal(4);
+      await expect(this.mock.$countConsecutive('0x78787878787878', 0, '0x78')).to.eventually.equal(7);
+      await expect(this.mock.$countConsecutive('0x78787878787878', 3, '0x78')).to.eventually.equal(4);
+    });
+
+    it('out of bound offset', async function () {
+      await expect(this.mock.$countConsecutive('0x000000', 3, '0x00')).to.eventually.equal(0);
+      await expect(this.mock.$countConsecutive('0x000000', 42, '0x00')).to.eventually.equal(0);
+    });
+  });
+
   describe('slice & splice', function () {
     describe('slice(bytes, uint256) & splice(bytes, uint256)', function () {
       for (const [descr, start] of Object.entries({