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.

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

Fifth iteration of the Court pallet #233

Merged
merged 1 commit into from
Aug 10, 2021
Merged

Fifth iteration of the Court pallet #233

merged 1 commit into from
Aug 10, 2021

Conversation

c410-f3r
Copy link
Contributor

depends on #231
cc #200

  • Updates nightly to a more recent version
  • Finishes on_dispute implementation

@c410-f3r c410-f3r changed the title Fourth iteration of the Court pallet Fifth iteration of the Court pallet Jul 21, 2021
Comment on lines +932 to +972
/// For each market, this holds the dispute information for each dispute that's
/// been issued.
#[pallet::storage]
pub type Disputes<T: Config> = StorageMap<
_,
Blake2_128Concat,
MarketIdOf<T>,
Vec<MarketDispute<T::AccountId, T::BlockNumber>>,
ValueQuery,
>;

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moving back to PM because Disputes is used by court and simple-disputes

@lsaether
Copy link
Member

lsaether commented Aug 9, 2021

#231 was merged, conflicts need to get fixed here

@@ -25,6 +25,12 @@ parameter_types! {
pub const MaxReserves: u32 = 50;
}

// Court
parameter_types! {
pub const CourtCaseDuration: u64 = 2 * BLOCKS_PER_DAY;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
pub const CourtCaseDuration: u64 = 2 * BLOCKS_PER_DAY;
pub const CourtCaseDuration: u64 = BLOCKS_PER_DAY;

@c410-f3r
Copy link
Contributor Author

c410-f3r commented Aug 9, 2021

Done

Copy link
Member

@sea212 sea212 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, looks good.

zrml/court/src/lib.rs Outdated Show resolved Hide resolved
zrml/court/src/lib.rs Outdated Show resolved Hide resolved
@c410-f3r c410-f3r reopened this Aug 9, 2021
Copy link
Member

@lsaether lsaether left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@lsaether lsaether added s:accepted This pull request is ready for merge and removed s:review-needed The pull request requires reviews labels Aug 10, 2021
@lsaether lsaether merged commit 47f4202 into main Aug 10, 2021
@c410-f3r
Copy link
Contributor Author

Thank you guys

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
s:accepted This pull request is ready for merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants