Skip to content

Commit

Permalink
98 voting pallet (Fair-Squares#109)
Browse files Browse the repository at this point in the history
* Updating branch with main updates (Fair-Squares#100)

* Runtime update

Update to polkadot-v0.9.26

* Token symbol and pallet-uniques

Added the pallet-uniques to the runtime, and changed the token Symbol to USD

* Benchmarking fixed

Co-authored-by: ndkazu <ndongmefane@gmail.com>
Co-authored-by: Kazunobu Ndong <33208377+ndkazu@users.noreply.github.com>

* Merge main into voting pallet branch (Fair-Squares#104)

* Runtime update

Update to polkadot-v0.9.26

* Token symbol and pallet-uniques

Added the pallet-uniques to the runtime, and changed the token Symbol to USD

* Benchmarking fixed

* refresh FS repo (Fair-Squares#101)

* update readme and badges

* delete diagram

* add w3f badge and adjust readme

* adjust size and position

* remove unused files

* adjusted the readme some more

* add w3f badge back

* changed from docker hub to ghcr registry

* small change to the DockerFile

* 102 automatization tasks (Fair-Squares#103)

* added a script to add a new pallet from a pallet template and configure the runtime Cargo.toml and lib.rs

* added a script to update polkadot lib in .toml files for the node, runtime, pallets and pallet template

Co-authored-by: ndkazu <ndongmefane@gmail.com>
Co-authored-by: Kazunobu Ndong <33208377+ndkazu@users.noreply.github.com>
Co-authored-by: Ilhan <29432367+ilhanu@users.noreply.github.com>
Co-authored-by: “ilhanu” <ilhanunlu@gmail.com>

* added voting pallet, added config in runtime

* added collective and democracy pallets to voting pallet and runtime config

* added collective and democracy config to runtime

* updated pallet_template

* added members to house council

* added functions to voting

* added pallet roles to voting

* update functions implementation

* added events, refactored code

* updated test configuration

* added call formating for collective::propose()

* added full process voting implementation with basic checks

* added origin check on proposal dispatching from Democracy

* added check origin call from collective pallet

* added proposal status transition management and documentation

* updated voting mockup for tests

* refactored code

* removed comments

* code review updates

* code review updates

* fix for voting benchmarking

* added fix for voting benchmarking

* fix update

* temporary deactivated voting benchmarking

* added unit tests

* added more tests

* renamed house_council to council in configuration

* removed democracy_porpose() call in investor voting

Co-authored-by: ndkazu <ndongmefane@gmail.com>
Co-authored-by: Kazunobu Ndong <33208377+ndkazu@users.noreply.github.com>
Co-authored-by: Ilhan <29432367+ilhanu@users.noreply.github.com>
Co-authored-by: “ilhanu” <ilhanunlu@gmail.com>
  • Loading branch information
5 people authored Aug 19, 2022
1 parent f2c046c commit 8779fc2
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 14 deletions.
3 changes: 0 additions & 3 deletions pallets/voting/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -298,9 +298,6 @@ pub mod pallet {
// A part of the initial deposit is freed to be reserved in the Democracy::propose() function
T::LocalCurrency::unreserve(&account_id, deposit);

// Call Democracy propose
DEMO::Pallet::<T>::propose(RawOrigin::Signed(account_id.clone()).into(),proposal_hash, propose_deposit)?;

let threshold = DEMO::VoteThreshold::SimpleMajority;
let delay = <T as Config>::Delay::get();

Expand Down
11 changes: 0 additions & 11 deletions pallets/voting/src/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -704,16 +704,5 @@ fn investor_vote_proposal_fail_should_succeed() {
VotingModule::democracy_proposals(hash.clone()).is_none(),
true
);

let mut event = <frame_system::Pallet<Test>>::events()
.pop()
.expect("Expected at least one EventRecord to be found")
.event;

// check that the event has been raised
assert_eq!(
event,
crate::mock::Event::Democracy(Event::NotPassed{ref_index: 1}),
);
});
}

0 comments on commit 8779fc2

Please sign in to comment.