Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove main and update functions as entrypoints #13

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

remove main and update functions as entrypoints #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 14 additions & 21 deletions src/contract.mligo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@

// ===============================================================================================

type proposal_params = Parameter.Types.proposal_params
type proposal_number = Parameter.Types.proposal_number
type storage = Storage.Types.t
type result = operation list * storage

module Preamble = struct
[@inline]
let prepare_new_proposal (params, storage: Parameter.Types.proposal_params * Storage.Types.t) : Storage.Types.proposal =
Expand All @@ -23,38 +28,26 @@ end

// ===============================================================================================

type result = operation list * Storage.Types.t

(**
* Proposal creation
*)
[@entry]
let create_proposal params (storage : Storage.Types.t) : result =
let proposal = Preamble.prepare_new_proposal(params, storage) in
let storage = Storage.Utils.register_proposal(proposal, storage) in
(Constants.no_operation, storage)
let create_proposal (params : proposal_params) (store : storage) : result =
let proposal = Preamble.prepare_new_proposal(params, store) in
let store = Storage.Utils.register_proposal(proposal, store) in
(Constants.no_operation, store)

(**
* Proposal signature
*)

[@entry]
let sign_proposal proposal_number (storage : Storage.Types.t) : result =
let proposal = Preamble.retrieve_a_proposal(proposal_number, storage) in
let sign_proposal (number : proposal_number) (store : storage) : result =
let proposal = Preamble.retrieve_a_proposal(number, store) in

let proposal = Storage.Utils.add_signer_to_proposal(proposal, (Tezos.get_sender ()), storage.threshold) in
let storage = Storage.Utils.update_proposal(proposal_number, proposal, storage) in
let proposal = Storage.Utils.add_signer_to_proposal(proposal, (Tezos.get_sender ()), store.threshold) in
let store = Storage.Utils.update_proposal(number, proposal, store) in

let operations = FA2.perform_operations proposal in

(operations, storage)

// ===============================================================================================

// This function is now only used for tests, and will be removed once tests are rewritten
let main (action: Parameter.Types.t) (storage: Storage.Types.t) : result =
match action with
| Create_proposal(proposal_params) ->
create_proposal proposal_params storage
| Sign_proposal(proposal_number) ->
sign_proposal proposal_number storage
(operations, store)
4 changes: 0 additions & 4 deletions src/parameter.mligo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,4 @@ module Types = struct
}

type proposal_number = nat

type t =
| Create_proposal of (proposal_params)
| Sign_proposal of (nat)
end
8 changes: 4 additions & 4 deletions test/multisig.test.jsligo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ import Types = P.Types

const assert_error = (res: test_exec_result, expected_error: string): unit => {
const expected_error2 = Test.eval(expected_error);
match(res) {
when(Fail(x)):do{
match (x) {
return match(res) {
when(Fail(x)):
match (x) {
when(Rejected(x)): assert(Test.michelson_equal(x[0], expected_error2));
when(Balance_too_low(_)):failwith("contract failed: balance too low");
when(Other(s)): failwith(s);
}};
};
when(Success(_)): failwith("Expected to fail but passed");
};
};
Expand Down