Skip to content

Commit f8c7730

Browse files
committed
Correct the generated code.
1 parent 3cbac84 commit f8c7730

8 files changed

+92
-92
lines changed

linera-views-derive/src/snapshots/linera_views_derive__tests__test_generate_view_code_metrics_C.snap

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,17 @@ where
2929
fn pre_load(context: &C) -> Result<Vec<Vec<u8>>, linera_views::ViewError> {
3030
use linera_views::context::Context as _;
3131
let mut keys = Vec::new();
32-
let index = 0;
32+
let index_byte = 0u8;
3333
let base_key = context
3434
.base_key()
35-
.derive_tag_key(linera_views::views::MIN_VIEW_TAG, &index)?;
35+
.derive_tag_key(linera_views::views::MIN_VIEW_TAG, &index_byte)?;
3636
keys.extend(
3737
RegisterView::<C, usize>::pre_load(&context.clone_with_base_key(base_key))?,
3838
);
39-
let index = 1;
39+
let index_byte = 1u8;
4040
let base_key = context
4141
.base_key()
42-
.derive_tag_key(linera_views::views::MIN_VIEW_TAG, &index)?;
42+
.derive_tag_key(linera_views::views::MIN_VIEW_TAG, &index_byte)?;
4343
keys.extend(
4444
CollectionView::<
4545
C,
@@ -55,22 +55,22 @@ where
5555
) -> Result<Self, linera_views::ViewError> {
5656
use linera_views::context::Context as _;
5757
let mut pos = 0;
58-
let index = 0;
59-
let pos_next = pos + RegisterView::<C, usize>::NUM_INIT_KEYS;
58+
let index_byte = 0u8;
6059
let base_key = context
6160
.base_key()
62-
.derive_tag_key(linera_views::views::MIN_VIEW_TAG, &index)?;
61+
.derive_tag_key(linera_views::views::MIN_VIEW_TAG, &index_byte)?;
62+
let pos_next = pos + RegisterView::<C, usize>::NUM_INIT_KEYS;
6363
let register = RegisterView::<
6464
C,
6565
usize,
6666
>::post_load(context.clone_with_base_key(base_key), &values[pos..pos_next])?;
6767
pos = pos_next;
68-
let index = 1;
69-
let pos_next = pos
70-
+ CollectionView::<C, usize, RegisterView<C, usize>>::NUM_INIT_KEYS;
68+
let index_byte = 1u8;
7169
let base_key = context
7270
.base_key()
73-
.derive_tag_key(linera_views::views::MIN_VIEW_TAG, &index)?;
71+
.derive_tag_key(linera_views::views::MIN_VIEW_TAG, &index_byte)?;
72+
let pos_next = pos
73+
+ CollectionView::<C, usize, RegisterView<C, usize>>::NUM_INIT_KEYS;
7474
let collection = CollectionView::<
7575
C,
7676
usize,

linera-views-derive/src/snapshots/linera_views_derive__tests__test_generate_view_code_metrics_C_with_where.snap

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,17 @@ where
3030
fn pre_load(context: &C) -> Result<Vec<Vec<u8>>, linera_views::ViewError> {
3131
use linera_views::context::Context as _;
3232
let mut keys = Vec::new();
33-
let index = 0;
33+
let index_byte = 0u8;
3434
let base_key = context
3535
.base_key()
36-
.derive_tag_key(linera_views::views::MIN_VIEW_TAG, &index)?;
36+
.derive_tag_key(linera_views::views::MIN_VIEW_TAG, &index_byte)?;
3737
keys.extend(
3838
RegisterView::<C, usize>::pre_load(&context.clone_with_base_key(base_key))?,
3939
);
40-
let index = 1;
40+
let index_byte = 1u8;
4141
let base_key = context
4242
.base_key()
43-
.derive_tag_key(linera_views::views::MIN_VIEW_TAG, &index)?;
43+
.derive_tag_key(linera_views::views::MIN_VIEW_TAG, &index_byte)?;
4444
keys.extend(
4545
CollectionView::<
4646
C,
@@ -56,22 +56,22 @@ where
5656
) -> Result<Self, linera_views::ViewError> {
5757
use linera_views::context::Context as _;
5858
let mut pos = 0;
59-
let index = 0;
60-
let pos_next = pos + RegisterView::<C, usize>::NUM_INIT_KEYS;
59+
let index_byte = 0u8;
6160
let base_key = context
6261
.base_key()
63-
.derive_tag_key(linera_views::views::MIN_VIEW_TAG, &index)?;
62+
.derive_tag_key(linera_views::views::MIN_VIEW_TAG, &index_byte)?;
63+
let pos_next = pos + RegisterView::<C, usize>::NUM_INIT_KEYS;
6464
let register = RegisterView::<
6565
C,
6666
usize,
6767
>::post_load(context.clone_with_base_key(base_key), &values[pos..pos_next])?;
6868
pos = pos_next;
69-
let index = 1;
70-
let pos_next = pos
71-
+ CollectionView::<C, usize, RegisterView<C, usize>>::NUM_INIT_KEYS;
69+
let index_byte = 1u8;
7270
let base_key = context
7371
.base_key()
74-
.derive_tag_key(linera_views::views::MIN_VIEW_TAG, &index)?;
72+
.derive_tag_key(linera_views::views::MIN_VIEW_TAG, &index_byte)?;
73+
let pos_next = pos
74+
+ CollectionView::<C, usize, RegisterView<C, usize>>::NUM_INIT_KEYS;
7575
let collection = CollectionView::<
7676
C,
7777
usize,

linera-views-derive/src/snapshots/linera_views_derive__tests__test_generate_view_code_metrics_CustomContext.snap

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,20 +34,20 @@ where
3434
) -> Result<Vec<Vec<u8>>, linera_views::ViewError> {
3535
use linera_views::context::Context as _;
3636
let mut keys = Vec::new();
37-
let index = 0;
37+
let index_byte = 0u8;
3838
let base_key = context
3939
.base_key()
40-
.derive_tag_key(linera_views::views::MIN_VIEW_TAG, &index)?;
40+
.derive_tag_key(linera_views::views::MIN_VIEW_TAG, &index_byte)?;
4141
keys.extend(
4242
RegisterView::<
4343
CustomContext,
4444
usize,
4545
>::pre_load(&context.clone_with_base_key(base_key))?,
4646
);
47-
let index = 1;
47+
let index_byte = 1u8;
4848
let base_key = context
4949
.base_key()
50-
.derive_tag_key(linera_views::views::MIN_VIEW_TAG, &index)?;
50+
.derive_tag_key(linera_views::views::MIN_VIEW_TAG, &index_byte)?;
5151
keys.extend(
5252
CollectionView::<
5353
CustomContext,
@@ -63,26 +63,26 @@ where
6363
) -> Result<Self, linera_views::ViewError> {
6464
use linera_views::context::Context as _;
6565
let mut pos = 0;
66-
let index = 0;
67-
let pos_next = pos + RegisterView::<CustomContext, usize>::NUM_INIT_KEYS;
66+
let index_byte = 0u8;
6867
let base_key = context
6968
.base_key()
70-
.derive_tag_key(linera_views::views::MIN_VIEW_TAG, &index)?;
69+
.derive_tag_key(linera_views::views::MIN_VIEW_TAG, &index_byte)?;
70+
let pos_next = pos + RegisterView::<CustomContext, usize>::NUM_INIT_KEYS;
7171
let register = RegisterView::<
7272
CustomContext,
7373
usize,
7474
>::post_load(context.clone_with_base_key(base_key), &values[pos..pos_next])?;
7575
pos = pos_next;
76-
let index = 1;
76+
let index_byte = 1u8;
77+
let base_key = context
78+
.base_key()
79+
.derive_tag_key(linera_views::views::MIN_VIEW_TAG, &index_byte)?;
7780
let pos_next = pos
7881
+ CollectionView::<
7982
CustomContext,
8083
usize,
8184
RegisterView<CustomContext, usize>,
8285
>::NUM_INIT_KEYS;
83-
let base_key = context
84-
.base_key()
85-
.derive_tag_key(linera_views::views::MIN_VIEW_TAG, &index)?;
8686
let collection = CollectionView::<
8787
CustomContext,
8888
usize,

linera-views-derive/src/snapshots/linera_views_derive__tests__test_generate_view_code_metrics_CustomContext_with_where.snap

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,20 +35,20 @@ where
3535
) -> Result<Vec<Vec<u8>>, linera_views::ViewError> {
3636
use linera_views::context::Context as _;
3737
let mut keys = Vec::new();
38-
let index = 0;
38+
let index_byte = 0u8;
3939
let base_key = context
4040
.base_key()
41-
.derive_tag_key(linera_views::views::MIN_VIEW_TAG, &index)?;
41+
.derive_tag_key(linera_views::views::MIN_VIEW_TAG, &index_byte)?;
4242
keys.extend(
4343
RegisterView::<
4444
CustomContext,
4545
usize,
4646
>::pre_load(&context.clone_with_base_key(base_key))?,
4747
);
48-
let index = 1;
48+
let index_byte = 1u8;
4949
let base_key = context
5050
.base_key()
51-
.derive_tag_key(linera_views::views::MIN_VIEW_TAG, &index)?;
51+
.derive_tag_key(linera_views::views::MIN_VIEW_TAG, &index_byte)?;
5252
keys.extend(
5353
CollectionView::<
5454
CustomContext,
@@ -64,26 +64,26 @@ where
6464
) -> Result<Self, linera_views::ViewError> {
6565
use linera_views::context::Context as _;
6666
let mut pos = 0;
67-
let index = 0;
68-
let pos_next = pos + RegisterView::<CustomContext, usize>::NUM_INIT_KEYS;
67+
let index_byte = 0u8;
6968
let base_key = context
7069
.base_key()
71-
.derive_tag_key(linera_views::views::MIN_VIEW_TAG, &index)?;
70+
.derive_tag_key(linera_views::views::MIN_VIEW_TAG, &index_byte)?;
71+
let pos_next = pos + RegisterView::<CustomContext, usize>::NUM_INIT_KEYS;
7272
let register = RegisterView::<
7373
CustomContext,
7474
usize,
7575
>::post_load(context.clone_with_base_key(base_key), &values[pos..pos_next])?;
7676
pos = pos_next;
77-
let index = 1;
77+
let index_byte = 1u8;
78+
let base_key = context
79+
.base_key()
80+
.derive_tag_key(linera_views::views::MIN_VIEW_TAG, &index_byte)?;
7881
let pos_next = pos
7982
+ CollectionView::<
8083
CustomContext,
8184
usize,
8285
RegisterView<CustomContext, usize>,
8386
>::NUM_INIT_KEYS;
84-
let base_key = context
85-
.base_key()
86-
.derive_tag_key(linera_views::views::MIN_VIEW_TAG, &index)?;
8787
let collection = CollectionView::<
8888
CustomContext,
8989
usize,

linera-views-derive/src/snapshots/linera_views_derive__tests__test_generate_view_code_metrics_custom__GenericContext_T_.snap

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,20 +34,20 @@ where
3434
) -> Result<Vec<Vec<u8>>, linera_views::ViewError> {
3535
use linera_views::context::Context as _;
3636
let mut keys = Vec::new();
37-
let index = 0;
37+
let index_byte = 0u8;
3838
let base_key = context
3939
.base_key()
40-
.derive_tag_key(linera_views::views::MIN_VIEW_TAG, &index)?;
40+
.derive_tag_key(linera_views::views::MIN_VIEW_TAG, &index_byte)?;
4141
keys.extend(
4242
RegisterView::<
4343
custom::GenericContext<T>,
4444
usize,
4545
>::pre_load(&context.clone_with_base_key(base_key))?,
4646
);
47-
let index = 1;
47+
let index_byte = 1u8;
4848
let base_key = context
4949
.base_key()
50-
.derive_tag_key(linera_views::views::MIN_VIEW_TAG, &index)?;
50+
.derive_tag_key(linera_views::views::MIN_VIEW_TAG, &index_byte)?;
5151
keys.extend(
5252
CollectionView::<
5353
custom::GenericContext<T>,
@@ -63,27 +63,27 @@ where
6363
) -> Result<Self, linera_views::ViewError> {
6464
use linera_views::context::Context as _;
6565
let mut pos = 0;
66-
let index = 0;
67-
let pos_next = pos
68-
+ RegisterView::<custom::GenericContext<T>, usize>::NUM_INIT_KEYS;
66+
let index_byte = 0u8;
6967
let base_key = context
7068
.base_key()
71-
.derive_tag_key(linera_views::views::MIN_VIEW_TAG, &index)?;
69+
.derive_tag_key(linera_views::views::MIN_VIEW_TAG, &index_byte)?;
70+
let pos_next = pos
71+
+ RegisterView::<custom::GenericContext<T>, usize>::NUM_INIT_KEYS;
7272
let register = RegisterView::<
7373
custom::GenericContext<T>,
7474
usize,
7575
>::post_load(context.clone_with_base_key(base_key), &values[pos..pos_next])?;
7676
pos = pos_next;
77-
let index = 1;
77+
let index_byte = 1u8;
78+
let base_key = context
79+
.base_key()
80+
.derive_tag_key(linera_views::views::MIN_VIEW_TAG, &index_byte)?;
7881
let pos_next = pos
7982
+ CollectionView::<
8083
custom::GenericContext<T>,
8184
usize,
8285
RegisterView<custom::GenericContext<T>, usize>,
8386
>::NUM_INIT_KEYS;
84-
let base_key = context
85-
.base_key()
86-
.derive_tag_key(linera_views::views::MIN_VIEW_TAG, &index)?;
8787
let collection = CollectionView::<
8888
custom::GenericContext<T>,
8989
usize,

linera-views-derive/src/snapshots/linera_views_derive__tests__test_generate_view_code_metrics_custom__GenericContext_T__with_where.snap

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,20 +35,20 @@ where
3535
) -> Result<Vec<Vec<u8>>, linera_views::ViewError> {
3636
use linera_views::context::Context as _;
3737
let mut keys = Vec::new();
38-
let index = 0;
38+
let index_byte = 0u8;
3939
let base_key = context
4040
.base_key()
41-
.derive_tag_key(linera_views::views::MIN_VIEW_TAG, &index)?;
41+
.derive_tag_key(linera_views::views::MIN_VIEW_TAG, &index_byte)?;
4242
keys.extend(
4343
RegisterView::<
4444
custom::GenericContext<T>,
4545
usize,
4646
>::pre_load(&context.clone_with_base_key(base_key))?,
4747
);
48-
let index = 1;
48+
let index_byte = 1u8;
4949
let base_key = context
5050
.base_key()
51-
.derive_tag_key(linera_views::views::MIN_VIEW_TAG, &index)?;
51+
.derive_tag_key(linera_views::views::MIN_VIEW_TAG, &index_byte)?;
5252
keys.extend(
5353
CollectionView::<
5454
custom::GenericContext<T>,
@@ -64,27 +64,27 @@ where
6464
) -> Result<Self, linera_views::ViewError> {
6565
use linera_views::context::Context as _;
6666
let mut pos = 0;
67-
let index = 0;
68-
let pos_next = pos
69-
+ RegisterView::<custom::GenericContext<T>, usize>::NUM_INIT_KEYS;
67+
let index_byte = 0u8;
7068
let base_key = context
7169
.base_key()
72-
.derive_tag_key(linera_views::views::MIN_VIEW_TAG, &index)?;
70+
.derive_tag_key(linera_views::views::MIN_VIEW_TAG, &index_byte)?;
71+
let pos_next = pos
72+
+ RegisterView::<custom::GenericContext<T>, usize>::NUM_INIT_KEYS;
7373
let register = RegisterView::<
7474
custom::GenericContext<T>,
7575
usize,
7676
>::post_load(context.clone_with_base_key(base_key), &values[pos..pos_next])?;
7777
pos = pos_next;
78-
let index = 1;
78+
let index_byte = 1u8;
79+
let base_key = context
80+
.base_key()
81+
.derive_tag_key(linera_views::views::MIN_VIEW_TAG, &index_byte)?;
7982
let pos_next = pos
8083
+ CollectionView::<
8184
custom::GenericContext<T>,
8285
usize,
8386
RegisterView<custom::GenericContext<T>, usize>,
8487
>::NUM_INIT_KEYS;
85-
let base_key = context
86-
.base_key()
87-
.derive_tag_key(linera_views::views::MIN_VIEW_TAG, &index)?;
8888
let collection = CollectionView::<
8989
custom::GenericContext<T>,
9090
usize,

0 commit comments

Comments
 (0)