Deploy and proposal for USDT market on Goerli

contracts/test/NonStandardFaucetFeeToken.sol

@@ -1,14 +1,15 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity 0.8.15;
 
+import "../IERC20NonStandard.sol";
 /**
  * @title Non-standard ERC20 token
  * @dev Implementation of the basic standard token.
  *  See https://github.com/ethereum/EIPs/issues/20
  * @dev With USDT fee token mechanism
  * @dev Note: `transfer` and `transferFrom` do not return a boolean
  */
-contract NonStandardFeeToken {
+contract NonStandardFeeToken is IERC20NonStandard {
     string public name;
     string public symbol;
     uint8 public decimals;
@@ -69,10 +70,9 @@ contract NonStandardFeeToken {
         emit Transfer(src, dst, sendAmount);
     }
 
-    function approve(address _spender, uint256 amount) external returns (bool) {
+    function approve(address _spender, uint256 amount) external {
         allowance[msg.sender][_spender] = amount;
         emit Approval(msg.sender, _spender, amount);
-        return true;
     }
 
     // For testing, just don't limit access on setting fees

test/buy-collateral-test.ts

@@ -382,7 +382,7 @@ describe('buyCollateral', function () {
     expect(p0.internal).to.be.deep.equal({ USDT: 0n, COMP: 0n });
     expect(p0.external).to.be.deep.equal({ USDT: exp(100, 6), COMP: 0n });
     expect(p1.internal).to.be.deep.equal({ USDT: 0n, COMP: 0n });
-    expect(p1.external).to.be.deep.equal({ USDT: exp(50, 6), COMP: 54450000000000000000n });
+    expect(p1.external).to.be.deep.equal({ USDT: exp(50, 6), COMP: exp(54.45, 18) });
     expect(r1).to.be.equal(exp(49.5, 6)); // 50 * 0.99 = 49.5
     expect(event(txn, 0)).to.be.deep.equal({
       Transfer: {
@@ -395,15 +395,15 @@ describe('buyCollateral', function () {
       Transfer: {
         from: comet.address,
         to: alice.address,
-        amount: 54450000000000000000n,
+        amount: exp(54.45, 18),
       }
     });
     expect(event(txn, 2)).to.be.deep.equal({
       BuyCollateral: {
         buyer: alice.address,
         asset: COMP.address,
         baseAmount: exp(49.5, 6),
-        collateralAmount: 55000000000000000000n,
+        collateralAmount: exp(55, 18),
       }
     });
   });

test/supply-test.ts

@@ -478,7 +478,6 @@ describe('supplyTo', function () {
       factory: (await ethers.getContractFactory('NonStandardFaucetFeeToken')) as NonStandardFaucetFeeToken__factory,
     };
 
-
     const protocol = await makeProtocol({ base: 'USDC', assets: assets });
     const { comet, tokens, users: [alice, bob] } = protocol;
     const { FeeToken } = tokens;