Merge remote-tracking branch 'origin/zk-cra/market-handler' into zk-c…

…ra/market-handler
teller-protocol · Jul 29, 2021 · ce38b12 · ce38b12
2 parents 6114b1e + af9c5fa
commit ce38b12
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/contracts/lending/ttoken/TToken_V1.sol b/contracts/lending/ttoken/TToken_V1.sol
@@ -446,8 +446,10 @@ contract TToken_V1 is ITToken, ReentryMods {
     }
 
     /**
-     * @notice it retrieves the value in the underlying tokens
-     *
+     * @notice it retrives the value in the underlying tokens
+     * @param amount the amount of underlying
+     * @param rate the rate the underlying is exchanging at
+     * @return value_ the value of the underlying
      */
     function _valueInUnderlying(uint256 amount, uint256 rate)
         internal

diff --git a/deploy/protocol.ts b/deploy/protocol.ts
@@ -137,6 +137,10 @@ const deployProtocol: DeployFunction = async (hre) => {
       contract: 'ProviderFactoryFacet',
       skipIfAlreadyDeployed: true,
     },
+    {
+      contract: 'ProviderFactoryFacet',
+      skipIfAlreadyDeployed: true,
+    },
     // NFT
     {
       contract: 'NFTFacet',

diff --git a/test/helpers/loans.ts b/test/helpers/loans.ts
@@ -1,3 +1,7 @@
+import { isBytesLike } from '@ethersproject/bytes'
+import { toUtf8Bytes } from '@ethersproject/strings'
+import { time, timeStamp } from 'console'
+import { createSign } from 'crypto'
 import {
   BigNumber,
   BigNumberish,

diff --git a/test/integration/dictionary.test.ts b/test/integration/dictionary.test.ts
@@ -37,6 +37,7 @@ describe('NFT Dictionary', () => {
 
       deployer = await getNamedSigner('deployer')
     })
+
     describe('Dictionary test', () => {
       beforeEach(async () => {
         // Advance time