Feature/rebase democracy #965

PraetorP · 2023-07-10T09:04:13Z

No description provided.

pallets/maintenance/src/lib.rs

runtime/common/config/pallets/governance.rs

runtime/common/config/xcm/mod.rs

runtime/quartz/Cargo.toml

mrshiposha · 2023-07-10T11:25:52Z

tests/src/maintenance.seqtest.ts

@@ -309,7 +302,7 @@ describe('Integration Test: Maintenance Functionality', () => {
          },
        ]);
        const preimage = helper.constructApiCall('api.tx.identity.forceInsertIdentities', [randomIdentities]).method.toHex();
-        preimageHashes.push(await notePreimage(helper, preimage));
+        preimageHashes.push(await helper.preimage.notePreimage(bob, preimage, true));


Хмм, по идее это не должно отличаться от текущего develop?

mrshiposha · 2023-07-10T11:26:14Z

tests/src/maintenance.seqtest.ts

@@ -332,7 +325,7 @@ describe('Integration Test: Maintenance Functionality', () => {
      const preimage = helper.constructApiCall('api.tx.balances.forceTransfer', [
        {Id: zeroAccount.address}, {Id: superuser.address}, 1000n,
      ]).method.toHex();
-      const preimageHash = await notePreimage(helper, preimage);
+      const preimageHash = await helper.preimage.notePreimage(bob, preimage, true);


И это, по идее, тоже не должно отличаться от текущего develop

mrshiposha · 2023-07-10T11:27:00Z

tests/src/util/index.ts

@@ -104,6 +104,11 @@ export enum Pallets {
  CollatorSelection = 'collatorselection',
  Session = 'session',
  Identity = 'identity',
+  Democracy = 'democracy',
+  Council = 'council',
+  //CouncilMembership = 'councilmembership',


Не помню почему это закомментировано

runtime/common/config/pallets/governance/types.rs

runtime/common/config/pallets/governance/fellowship.rs

runtime/common/config/pallets/governance/origins.rs

runtime/common/config/pallets/governance/technical_committee.rs

runtime/common/config/pallets/governance/types.rs

runtime/common/construct_runtime.rs

pallets/configuration/src/lib.rs

runtime/common/config/pallets/governance/types.rs

runtime/common/config/pallets/governance/council_collective.rs

runtime/common/config/pallets/governance/technical_committee.rs

runtime/common/config/pallets/governance/types.rs

runtime/common/construct_runtime.rs

runtime/common/config/pallets/governance/technical_committee.rs

runtime/common/config/pallets/governance/fellowship.rs

tests/src/governance/council.test.ts

mrshiposha · 2023-08-11T15:23:34Z

tests/src/governance/council.test.ts

+  });
+
+  itSub('Superuser can add a member', async ({helper}) => {
+    const [newMember] = await helper.arrange.createAccounts([0n], donor);


Я видел у нас добавился специальный метод для создания пустых акков. Наверное, его здесь использовать будет хорошо. В других похожих местах, думаю, тоже.

tests/src/governance/council.test.ts

mrshiposha · 2023-08-11T15:27:39Z

tests/src/governance/council.test.ts

+
+  itSub('Superuser can add a member', async ({helper}) => {
+    const [newMember] = await helper.arrange.createAccounts([0n], donor);
+    await expect(helper.getSudo().executeExtrinsic(sudoer, 'api.tx.councilMembership.addMember', [newMember.address])).to.be.fulfilled;


У нас есть в плейграундах класс, который предоставляет методы для работы с membership. Там есть методы addMember/getMembers и прочие. Лучше использовать их, а не напрямую дергать executeExtrinsic. Во всех похожих местах.

mrshiposha · 2023-08-11T15:37:12Z

tests/src/governance/council.test.ts

+  itSub('[Negative] Council cannot submit regular democracy proposal', async ({helper}) => {
+    const councilProposal = await helper.democracy.proposeCall(dummyProposalCall(helper), 0n);
+
+    await expect(proposalFromCouncil(councilProposal)).to.be.rejectedWith('Proposal execution failed with BadOrigin');


Такие reject'ы у нас в других тестах обычно ловяться по regex'у:

Suggested change

await expect(proposalFromCouncil(councilProposal)).to.be.rejectedWith('Proposal execution failed with BadOrigin');

await expect(proposalFromCouncil(councilProposal)).to.be.rejectedWith(/BadOrigin/);

Не только. Можно просто строкой

Можно, но /BadOrigin/ покрывает вообще все случаи. В других тестах (не только governance) как правило используется именно такой вариант

Строка тоже вхождение проверяет а не полное совпадение
Регулярки есть смысл использовать только для проверки полной ошибки: /^section\.BadOrigin$/

mrshiposha · 2023-08-11T15:38:59Z

tests/src/governance/council.test.ts

+    await expect(proposalFromCouncil(councilProposal)).to.be.rejectedWith('Proposal execution failed with BadOrigin');
+  });
+
+  itSub('[Negative] Cannot add a duplicate Council member', async ({helper}) => {


Не уверен, что нам вообще нужен этот тест-кейс. Мы тут тестируем логику (которая написана не нами, а Парити), а не нашу настройку.

То же самое относится к другим тестам про мемберов-дубликатов

Да, поддерживаю, давайте уберем.
Итак слишком долго идут тесты

mrshiposha · 2023-08-11T15:57:39Z

tests/src/governance/council.test.ts

+
+  itSub('[Negative] Council member cannot add/remove a Council member', async ({helper}) => {
+    const [newCouncilMember] = await helper.arrange.createAccounts([0n], donor);
+    await expect(helper.council.membership.addMember(counselors.alex, newCouncilMember.address)).to.be.rejectedWith('BadOrigin');


Council Member (как и TechComm Member) -- это особенный origin соот-го коллектива, а не обычные signed origin'ы, соот-но, не смотря на то, что тест проходит, он тестирует не то, что нужно.

В данном случае, этот тест тестирует, что обычный signed-origin не может добавить/убрать советника. А нам нужное другое.

Здесь и в других "Council member" тестах нужно использовать экстринзик council.execute.

Для TechComm -- аналогично

То, что у них там как раз не совсем корректно (имхо) сделан адаптер Еншюр мамбер, я как раз заметил в тех ком. Тут не правил еще - поскольку решил это сделать после реализации тестов.

mrshiposha · 2023-08-14T12:05:24Z

tests/src/governance/council.test.ts

+    )).to.be.rejectedWith('BadOrigin');
+    await expect(helper.council.collective.execute(
+      counselors.alex,
+      helper.technicalCommittee.membership.removeMemberCall(counselors.charu.address),


Не того удаляем. Надо удалять члена тех-коммитета здесь. А в данном случае удаляется член совета из тех коммитета.

Вообще без разницы кого - мы смотрим, что это упадет с BadOrigin а не с какой либо другой ошибкой, тест не про то, что не можем удалить несуществующего мембера.

tests/src/governance/council.test.ts

tests/src/governance/technicalCommittee.test.ts

mrshiposha · 2023-08-14T14:05:26Z

tests/src/governance/technicalCommittee.test.ts

+    )).to.be.rejectedWith('Proposal execution failed with BadOrigin');
+  });
+
+  itSub('[Negative] TechComm member cannot blacklist Democracy proposals', async ({helper}) => {


Надо бы еще добавить тест, что коммитет целиком НЕ может блеклистить. Я такого теста не вижу.
(Может только Совет)

tests/src/governance/technicalCommittee.test.ts

Co-authored-by: Daniel Shiposha <mrshiposha@gmail.com>

runtime/common/config/pallets/governance/fellowship.rs

runtime/common/config/pallets/governance/scheduler.rs

runtime/common/construct_runtime.rs

CertainLach · 2023-08-18T08:29:43Z

runtime/common/construct_runtime.rs

-				#[cfg(feature = "preimage")]
-				Preimage: pallet_preimage = 41,
+                #[cfg(feature = "preimage")]
+                Preimage: pallet_preimage::{Pallet, Call, Storage, Event<T>} = 41,


Когда какие-то компоненты выбрасываются, стоит писать зачем и какие
+ в construct_runtime есть exclude_parts, чтобы не перечислять то что есть, но явно исключить то, что нам мешает (Тут я так вижу нам ничего не мешает, и просто перечислены все дефолт компоненты? Зачем тогда менялось описание у preimage?)

runtime/quartz/src/governance_timings.rs

Added fn for hard reset some of pallets

Added hard reset for some of the pallets

Co-authored-by: Yaroslav Bolyukin <iam@lach.pw>

- Removed debug test info - Added new test for current Add\Remove assoc. type - Changed gov settings -Added helper `getMembers` for RankedCollective group

.github/workflows/gov.yml

CertainLach · 2023-08-22T08:19:01Z

pallets/gov-origins/Cargo.toml

+# Substrate Dependencies
+
+# Note: `package = "parity-scale-codec"` must be supplied since the `Encode` macro searches for it.
+codec = { workspace = true, package = "parity-scale-codec" }


Может, в новых палетах ссылаться через исходное название?

Suggested change

codec = { workspace = true, package = "parity-scale-codec" }

parity-scale-codec = { workspace = true }

Cargo начал жаловаться на атрибут package, потому что он тут не работает, и хотелось бы эти ворнинги постепенно везде исправить

Макросы фрейма ищут parity-scale-codec, они просто принимают его и в качестве названия, и в качестве пакета
И когда мы передаём в качестве названия пакета, нам не хватает указать это название в воркспейсе, макросы использующие Codec не умеют работать с воркспейсами

В репах субстрата и polkadot тоже потихоньку переходит

runtime/common/construct_runtime.rs

runtime/unique/src/governance_timings.rs

Fixed condition for skipping unique scheduler tests. Added full name codec dep .

PraetorP requested a review from mrshiposha July 10, 2023 09:04

mrshiposha reviewed Jul 10, 2023

View reviewed changes

pallets/maintenance/src/lib.rs Outdated Show resolved Hide resolved

mrshiposha reviewed Jul 10, 2023

View reviewed changes

PraetorP force-pushed the feature/rebase-democracy branch from ebad835 to 080f0b8 Compare July 10, 2023 11:29

mrshiposha requested changes Jul 19, 2023

View reviewed changes

mrshiposha requested changes Jul 21, 2023

View reviewed changes

mrshiposha reviewed Jul 21, 2023

View reviewed changes

runtime/common/config/pallets/governance/technical_committee.rs Outdated Show resolved Hide resolved

mrshiposha reviewed Jul 21, 2023

View reviewed changes

runtime/common/config/pallets/governance/fellowship.rs Outdated Show resolved Hide resolved

PraetorP marked this pull request as ready for review July 21, 2023 14:35

mrshiposha force-pushed the feature/rebase-democracy branch from 978c431 to d6034f6 Compare July 24, 2023 10:38

mrshiposha added the CI-governance for CI workflows label Aug 11, 2023

mrshiposha marked this pull request as draft August 11, 2023 13:55

mrshiposha marked this pull request as ready for review August 11, 2023 13:55

mrshiposha requested changes Aug 11, 2023

View reviewed changes

mrshiposha requested changes Aug 14, 2023

View reviewed changes

PraetorP force-pushed the feature/rebase-democracy branch from f887261 to 4916df9 Compare August 17, 2023 09:40

Daniel Shiposha and others added 14 commits August 17, 2023 09:42

feature: democracy draft

da28bfd

fix: basic democracy setup

812d078

fix: cargo fmt

1a21e9c

feat: setup maintenance manager origin

8c486c1

feat: root or tech comm cna set collators

8f3d4f9

feat: root or tech commm can set identities

92a970c

fix: remove democracy benchmarks

edb312a

fix: pallet-presence

55e3004

fix: externalDefaultOrigin

fa7bc54

fix: all tech comm can suspend/resume xcm

bb9db42

test(governance): first batch

9d3f0ac

revert(democracy): launch-config

9196cdc

refactor(governance): address suggestions

e2a187f

refactor(governance): switch to frame's democracy pallet

70505c1

mrshiposha and others added 10 commits August 17, 2023 09:46

fix: optimize techcomm imports

6cc34b0

fix: exclude unique from gov workflow

694d333

Update tests/src/governance/council.test.ts

3e764be

Co-authored-by: Daniel Shiposha <mrshiposha@gmail.com>

fix(test governance): origin for council members

d84de6a

No more state in governance test utils

ea7e0f0

fix typo

ede8936

fix(test gov): dummy prop impl

312b0e8

test(governance): refactor & remove unused

9525b83

refactor(gobv test): initCouncil

8aa555a

chore(governance): after rebase fixes

ca4d9ec

PraetorP force-pushed the feature/rebase-democracy branch from 4916df9 to ca4d9ec Compare August 17, 2023 09:56

PraetorP and others added 5 commits August 17, 2023 09:59

fix: fmt

c6149d6

fix: fmt & types

75f11ab

chore: polkadot types

e652470

chore(gov): fix gov workflow

1249da3

change api port to rpc for 0.9.43 polkadot

e741bc9

CertainLach requested changes Aug 18, 2023

View reviewed changes

PraetorP and others added 7 commits August 18, 2023 12:04

test(gov): fix waiter for block

3a8397a

Added fn for hard reset some of pallets

test(gov): fix waiter for block

e32efd6

Added hard reset for some of the pallets

Update runtime/common/config/pallets/governance/fellowship.rs

96c5bed

Co-authored-by: Yaroslav Bolyukin <iam@lach.pw>

add var wasm_name for goverments workflow for running sapphire

a243f3a

fix(runtime): spces -> tabs

9025c94

add var wasm_name for goverments workflow for running sapphire

55ebfc9

refactor(governance):

45b1780

- Removed debug test info - Added new test for current Add\Remove assoc. type - Changed gov settings -Added helper `getMembers` for RankedCollective group

CertainLach requested changes Aug 22, 2023

View reviewed changes

PraetorP added 3 commits August 22, 2023 11:22

refactor(governacne): nitpicks

83dea11

refactor(governance):construct runtime.

104c845

Fixed condition for skipping unique scheduler tests. Added full name codec dep .

fix(gov): added origins to pallets list

acdf6a4

CertainLach merged commit 1a4aa2d into develop Aug 23, 2023
12 of 19 checks passed

CertainLach deleted the feature/rebase-democracy branch August 23, 2023 09:09

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature/rebase democracy #965

Feature/rebase democracy #965

PraetorP commented Jul 10, 2023

mrshiposha Jul 10, 2023

mrshiposha Jul 10, 2023

mrshiposha Jul 10, 2023

mrshiposha Aug 11, 2023

mrshiposha Aug 11, 2023

mrshiposha Aug 11, 2023

PraetorP Aug 14, 2023

mrshiposha Aug 14, 2023

CertainLach Aug 14, 2023 •

edited

Loading

mrshiposha Aug 11, 2023

uandysmith Aug 14, 2023

mrshiposha Aug 11, 2023

PraetorP Aug 14, 2023

mrshiposha Aug 14, 2023

PraetorP Aug 15, 2023

mrshiposha Aug 14, 2023

CertainLach Aug 18, 2023 •

edited

Loading

CertainLach Aug 22, 2023

CertainLach Aug 22, 2023

CertainLach Aug 22, 2023

	await expect(proposalFromCouncil(councilProposal)).to.be.rejectedWith('Proposal execution failed with BadOrigin');
	await expect(proposalFromCouncil(councilProposal)).to.be.rejectedWith(/BadOrigin/);

	codec = { workspace = true, package = "parity-scale-codec" }
	parity-scale-codec = { workspace = true }

Feature/rebase democracy #965

Feature/rebase democracy #965

Conversation

PraetorP commented Jul 10, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

CertainLach Aug 14, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

CertainLach Aug 18, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

CertainLach Aug 14, 2023 •

edited

Loading

CertainLach Aug 18, 2023 •

edited

Loading