Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/edonet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
with:
node-version: 12.x
- run: yarn
- run: yarn run fix-ligo-version 0.11.0
- run: yarn run fix-ligo-version 0.16.1
- run: yarn run sandbox:start &
- name: Wait 30 seconds for sandbox
uses: kibertoad/wait-action@master
Expand All @@ -34,7 +34,7 @@ jobs:
with:
node-version: 12.x
- run: yarn
- run: yarn run fix-ligo-version 0.11.0
- run: yarn run fix-ligo-version 0.16.1
- run: yarn run sandbox:start &
- name: Wait 30 seconds for sandbox
uses: kibertoad/wait-action@master
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

- Docker - used to run a local Tezos node together with the LIGO compiler (If you're on linux, follow the post-installation steps as well)
- Node.js `v12` - Javascript runtime environment that we'll use for testing and deployment
- LIGO `0.11.0` - High level programming language for the Tezos blockchain
- LIGO `0.16.1` - High level programming language for the Tezos blockchain
- truffle@tezos - Testing framework, originally built for Ethereum that now includes support for Tezos.
- ganache-cli@tezos - Part of the Truffle suite of blockchain development tools. It creates isolated sandboxes using Flextesa to automate reproducible tests with faster networks.

Expand All @@ -15,7 +15,7 @@

```
yarn
yarn run fix-ligo-version 0.11.0
yarn run fix-ligo-version 0.16.1
yarn run sandbox:start
yarn run test
```
Expand Down
2 changes: 1 addition & 1 deletion contracts/main/farm/farm.religo
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ type entrypointReturn = (list(operation), storage);
let main = ((parameter,storage): (parameter, storage)): entrypointReturn => {
switch(parameter) {
| Deposit(parameter) => deposit(parameter, storage);
| Claim(parameter) => claim(storage);
| Claim(_parameter) => claim(storage);
| Withdraw(parameter) => withdraw(parameter, storage);
| WithdrawProfit(parameter) => withdrawProfit(parameter, storage);
| UpdatePlan(parameter) => updatePlan(parameter, storage);
Expand Down
6 changes: 4 additions & 2 deletions contracts/main/farm/test/mockContract.religo
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,12 @@ type functionToTest =

let main = ((functionToTest, storage): (functionToTest, storage)) => {
switch (functionToTest) {
| UpdatePool(updatePoolParameter) => {
| UpdatePool(_updatePoolParameter) => {
let storage = updatePool(storage);
([]: list(operation), storage);
}
| U(parameter) => ([]: list(operation), storage)
| U(_unitParameter) => {
([]: list(operation), storage)
}
};
};
2 changes: 1 addition & 1 deletion contracts/partials/farm/escape/escape.religo
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Emergency withdraw function called escape is an extra layer of protection
* for delegators. Do not call this except the farm encounters a critical bug.
*/
let escape = ((escapeParameter, storage): (escapeParameter, storage)): entrypointReturn => {
let escape = ((_escapeParameter, storage): (escapeParameter, storage)): entrypointReturn => {
let delegator = Tezos.sender;
let delegatorRecord = getDelegator(delegator, storage);
// update farm's LP token balance
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ let checkDelegator = ((delegator, storage): (address, storage)): bool => {
storage.delegators
);
switch(delegator) {
| Some(delegator) => true
| Some(_delegator) => true
| None => false
};
};
Expand Down
2 changes: 0 additions & 2 deletions contracts/partials/farm/withdraw/withdraw.religo
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ let withdraw = ((withdrawParameter, storage): (withdrawParameter, storage)): ent
let (rewardTokenTransferOperationList, storage) = claim(storage);

let delegator = Tezos.sender;
let delegatorRecord = getDelegator(delegator, storage);

let storage = decreaseDelegatorBalance(delegator, withdrawParameter, storage);
let farmLpTokenBalance = safeBalanceSubtraction(storage.farmLpTokenBalance, withdrawParameter);
let storage = setFarmLpTokenBalance(farmLpTokenBalance, storage);
Expand Down