Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Duniter v2S
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
nodes
rust
Duniter v2S
Commits
a624304b
Commit
a624304b
authored
3 years ago
by
Éloïs
Browse files
Options
Downloads
Patches
Plain Diff
fix(certification): remove_cert must update StorageCertsByReceiver
parent
436ec7ac
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
pallets/certification/src/lib.rs
+13
-6
13 additions, 6 deletions
pallets/certification/src/lib.rs
with
13 additions
and
6 deletions
pallets/certification/src/lib.rs
+
13
−
6
View file @
a624304b
...
@@ -117,7 +117,7 @@ pub mod pallet {
...
@@ -117,7 +117,7 @@ pub mod pallet {
#[derive(Encode,
Decode,
Clone,
Copy,
PartialEq,
Eq,
RuntimeDebug)]
#[derive(Encode,
Decode,
Clone,
Copy,
PartialEq,
Eq,
RuntimeDebug)]
pub
struct
CertValue
<
T
:
Config
<
I
>
,
I
:
Instance
>
{
pub
struct
CertValue
<
T
:
Config
<
I
>
,
I
:
Instance
>
{
chain
able_on
:
T
::
BlockNumber
,
renew
able_on
:
T
::
BlockNumber
,
removable_on
:
T
::
BlockNumber
,
removable_on
:
T
::
BlockNumber
,
phantom
:
PhantomData
<
I
>
,
phantom
:
PhantomData
<
I
>
,
}
}
...
@@ -185,8 +185,9 @@ pub mod pallet {
...
@@ -185,8 +185,9 @@ pub mod pallet {
<
StorageVersion
<
I
>>
::
put
(
Releases
::
V1_0_0
);
<
StorageVersion
<
I
>>
::
put
(
Releases
::
V1_0_0
);
// Write StorageCertsByReceiver
// Write StorageCertsByReceiver
for
(
receiver
,
issuers
)
in
certs_by_receiver
{
for
(
receiver
,
mut
issuers
)
in
certs_by_receiver
{
cert_meta_by_issuer
.entry
(
receiver
)
.and_modify
(|
cert_meta
|
cert_meta
.received_count
=
issuers
.len
()
as
u32
);
cert_meta_by_issuer
.entry
(
receiver
)
.and_modify
(|
cert_meta
|
cert_meta
.received_count
=
issuers
.len
()
as
u32
);
issuers
.sort
();
<
StorageCertsByReceiver
<
T
,
I
>>
::
insert
(
receiver
,
issuers
);
<
StorageCertsByReceiver
<
T
,
I
>>
::
insert
(
receiver
,
issuers
);
}
}
// Write StorageIdtyCertMeta
// Write StorageIdtyCertMeta
...
@@ -199,7 +200,7 @@ pub mod pallet {
...
@@ -199,7 +200,7 @@ pub mod pallet {
for
receiver
in
receivers
{
for
receiver
in
receivers
{
all_couples
.push
((
*
issuer
,
*
receiver
));
all_couples
.push
((
*
issuer
,
*
receiver
));
<
StorageCertsByIssuer
<
T
,
I
>>
::
insert
(
issuer
,
receiver
,
CertValue
{
<
StorageCertsByIssuer
<
T
,
I
>>
::
insert
(
issuer
,
receiver
,
CertValue
{
chain
able_on
:
T
::
RenewablePeriod
::
get
(),
renew
able_on
:
T
::
RenewablePeriod
::
get
(),
removable_on
:
T
::
ValidityPeriod
::
get
(),
removable_on
:
T
::
ValidityPeriod
::
get
(),
phantom
:
PhantomData
,
phantom
:
PhantomData
,
});
});
...
@@ -240,8 +241,8 @@ pub mod pallet {
...
@@ -240,8 +241,8 @@ pub mod pallet {
// Verify rule RenewablePeriod
// Verify rule RenewablePeriod
frame_support
::
runtime_print!
(
"add_cert({:?}, {:?}): Verify rule RenewablePeriod"
,
issuer
,
receiver
);
frame_support
::
runtime_print!
(
"add_cert({:?}, {:?}): Verify rule RenewablePeriod"
,
issuer
,
receiver
);
let
create
=
if
let
Ok
(
CertValue
{
chain
able_on
,
..
})
=
<
StorageCertsByIssuer
<
T
,
I
>>
::
try_get
(
issuer
,
receiver
)
{
let
create
=
if
let
Ok
(
CertValue
{
renew
able_on
,
..
})
=
<
StorageCertsByIssuer
<
T
,
I
>>
::
try_get
(
issuer
,
receiver
)
{
if
chain
able_on
>
block_number
{
if
renew
able_on
>
block_number
{
return
Err
(
Error
::
<
T
,
I
>
::
NotRespectRenewablePeriod
.into
());
return
Err
(
Error
::
<
T
,
I
>
::
NotRespectRenewablePeriod
.into
());
}
}
false
false
...
@@ -271,7 +272,7 @@ pub mod pallet {
...
@@ -271,7 +272,7 @@ pub mod pallet {
// Write StorageCertsRemovableOn and StorageCertsByIssuer
// Write StorageCertsRemovableOn and StorageCertsByIssuer
let
cert_value
=
CertValue
{
let
cert_value
=
CertValue
{
chain
able_on
:
block_number
+
T
::
RenewablePeriod
::
get
(),
renew
able_on
:
block_number
+
T
::
RenewablePeriod
::
get
(),
removable_on
:
block_number
+
T
::
ValidityPeriod
::
get
(),
removable_on
:
block_number
+
T
::
ValidityPeriod
::
get
(),
phantom
:
PhantomData
,
phantom
:
PhantomData
,
};
};
...
@@ -358,6 +359,12 @@ pub mod pallet {
...
@@ -358,6 +359,12 @@ pub mod pallet {
}
}
});
});
if
removed
{
if
removed
{
<
StorageCertsByReceiver
<
T
,
I
>>
::
mutate_exists
(
receiver
,
|
issuers_opt
|
{
let
issuers
=
issuers_opt
.get_or_insert
(
Vec
::
with_capacity
(
0
));
if
let
Ok
(
index
)
=
issuers
.binary_search
(
&
issuer
)
{
issuers
.remove
(
index
);
}
});
let
issuer_issued_count
=
let
issuer_issued_count
=
<
StorageIdtyCertMeta
<
T
,
I
>>
::
mutate_exists
(
issuer
,
|
cert_meta_opt
|
{
<
StorageIdtyCertMeta
<
T
,
I
>>
::
mutate_exists
(
issuer
,
|
cert_meta_opt
|
{
let
cert_meta
=
cert_meta_opt
.get_or_insert
(
IdtyCertMeta
::
default
());
let
cert_meta
=
cert_meta_opt
.get_or_insert
(
IdtyCertMeta
::
default
());
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment