Fix sophia-vote-contract #69

eltNEG · 2020-01-20T12:46:51Z

Description

It fixed the outdated contract in sophia-vote-contract.md. It also replaces all references to forgae with aeproject.

Tasks completed

Fix the Sophia contract in sophia-vote-contract.md
Replaces references to forgae with aeproject

Notes

None

thepiwo

looks good, added some comments

thepiwo · 2020-01-20T19:48:46Z

sophia-vote-contract.md

            votes[candidate] = { voters = [] } })

-   private function look_up_by_address(k : address, m, v) =
+   function lookup_by_address(k : address, m, v) =


can be replaced with Map.lookup_default(k : 'k, m : map('k, 'v), v : 'v) : 'v

thepiwo · 2020-01-20T19:50:12Z

sophia-vote-contract.md

 We need to make use of a `size` function which we define as a helper function below. Here is the code:
 `````
-private function size(l : list('a)) : int = size'(l, 0)
+function size(l : list('a)) : int = size'(l, 0)


The size function is now included with the standard library

include "List.aes"

https://github.com/aeternity/protocol/blob/master/contracts/sophia_stdlib.md#length

Thanks for the feedback. I tried a couple of syntaxes which returns unbound variable... error

Tried syntaxes

List.length(state.votes[candidate].voters) length(state.votes[candidate].voters) List.size(state.votes[candidate].voters) size(state.votes[candidate].voters)

Kindly assist with this

I failed to `include "List.aes". It is working now.

thepiwo · 2020-01-20T19:50:33Z

sophia-vote-contract.md

+   let new_votes_state = Call.caller :: state.votes[candidate].voters
+   put(state{
+      votes[candidate].voters = new_votes_state })
+   true


guess there is no need to return true

Thanks for the feedback. I have removed it. Kindly, resolve the conversation if you are satisfied with the new changes.

still seems to be there

thepiwo · 2020-01-20T19:53:42Z

maybe @DanielaIvanova can check as well :)

hanssv · 2020-01-20T21:42:25Z

sophia-vote-contract.md

      votes: map(address, candidates) }

-   public stateful function init() : state = {
+   stateful entrypoint init() : state = {


This function does nothing stateful so the keyword can be removed.

Thanks. I have implemented the requested changes. Can you resolve the conversation?

hanssv · 2020-01-20T21:44:26Z

sophia-vote-contract.md


-   public stateful function vote(candidate: address) : bool =
+   stateful entrypoint vote(candidate: address) : bool =
      is_candidate(candidate)


This is convoluted, you better use a default value when looking up the candidate and do away with the is_candidate function. I.e. something like this:

stateful vote(candidate: address) : unit = let current_votes = state.votes[candidate = {voters = []}].voters put(state{ votes[candidate] = {voters = Call.caller :: current_votes }})

I have a dilemma here. With this change, there will be no need for add_candidate function. Can you give me feedback on the new full contract? I will change the wordings in the tutorial when the contract is satisfactory.

cc: @thepiwo ,

hanssv · 2020-01-20T21:44:38Z

sophia-vote-contract.md

         _ :: l' => size'(l', x + 1)

-   public stateful function add_candidate(candidate: address) : bool =
+   stateful entrypoint add_candidate(candidate: address) : bool =


I don't see the point in always returning true?

This is my first time using a language without a return statement. I think it's a reaction to the weird feeling 🙈. Thanks, I have removed them.

I have implemented the requested changes. Can you resolve the conversation?

hanssv · 2020-01-20T21:54:13Z

sophia-vote-contract.md

-      switch(l)
-         [] => x
-         _ :: l' => size'(l', x + 1)
+function size'(l : list('a), x : int) : int =


With compiler v4.2.0 this can be written more nicely as:

function size' : (list('a), int) => int size'([], x) = x size'(_ :: l, x) = size'(l, x + 1)

But as @thepiwo mention it is a standard library function.

I have implemented the requested changes. Can you resolve the conversation?

still seems to be there in the explaination

Yes. I want the contract reviewed before I change the content of the tutorial.

I don't think there is any need to document size any more

hanssv · 2020-01-21T08:44:03Z

sophia-vote-contract.md

+First we have to initialize our project where we write our smart contract. In order to do this we are going to use `aeproject init`.

 ## Smart contract
 In Sophia ML we have a state which is the place to store data on-chain - and it is the only part in the smart contract that can be mutated (overwritten).


Suggested change

In Sophia ML we have a state which is the place to store data on-chain - and it is the only part in the smart contract that can be mutated (overwritten).

In Sophia we have a state which is the place to store data on-chain - and it is the only part in the smart contract that can be mutated (overwritten).

I have implemented the requested changes. Can you resolve the conversation?

thepiwo · 2020-01-21T15:05:43Z

sophia-vote-contract.md

-         None => v
-         Some(x) => x
-`````````
+      Map.lookup_default(k, m, v)


the whole function can be removed and replaced

Fix sophia-vote-contract

cebfaa6

thepiwo reviewed Jan 20, 2020

View reviewed changes

thepiwo requested a review from DanielaIvanova January 20, 2020 19:53

hanssv reviewed Jan 20, 2020

View reviewed changes

hanssv reviewed Jan 21, 2020

View reviewed changes

eltNEG force-pushed the fix/sophia-vote-contract branch from de88f12 to 630dab6 Compare January 21, 2020 13:58

thepiwo reviewed Jan 21, 2020

View reviewed changes

eltNEG force-pushed the fix/sophia-vote-contract branch 2 times, most recently from ceb45b3 to b2d508a Compare January 21, 2020 17:02

eltNEG force-pushed the fix/sophia-vote-contract branch from b2d508a to a6f3c2e Compare January 29, 2020 11:13

Implement feedback: restructure vote-contract

9d8af93

eltNEG force-pushed the fix/sophia-vote-contract branch from a6f3c2e to 9d8af93 Compare January 29, 2020 11:18

thepiwo approved these changes Jan 29, 2020

View reviewed changes

DanielaIvanova approved these changes Jan 30, 2020

View reviewed changes

Pegahbit merged commit 632af5f into aeternity:master Jan 30, 2020

	In Sophia ML we have a state which is the place to store data on-chain - and it is the only part in the smart contract that can be mutated (overwritten).
	In Sophia we have a state which is the place to store data on-chain - and it is the only part in the smart contract that can be mutated (overwritten).

Fix sophia-vote-contract #69

Fix sophia-vote-contract #69

Uh oh!

Conversation

eltNEG commented Jan 20, 2020

Uh oh!

thepiwo left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

thepiwo commented Jan 20, 2020

Uh oh!

Choose a reason for hiding this comment

Uh oh!

eltNEG Jan 21, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

eltNEG Jan 21, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

eltNEG Jan 21, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

eltNEG Jan 21, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

eltNEG Jan 21, 2020 •

edited

Loading

eltNEG Jan 21, 2020 •

edited

Loading

eltNEG Jan 21, 2020 •

edited

Loading

eltNEG Jan 21, 2020 •

edited

Loading