Sitelet https://github.com/Fantom-foundation/go-opera/commit/1c6e7c65a47e8d9dea8bddf5867217e29fa50e0b
Skip to content

Commit 1c6e7c6

Browse files
rus-alexrus-alex
committed
U64fromZero() -> U56()
1 parent 8731fb4 commit 1c6e7c6

3 files changed

Lines changed: 28 additions & 31 deletions

File tree

‎inter/event_serializer.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ func (e *EventPayload) MarshalCSER(w *cser.Writer) error {
137137
w.FixedBytes(e.sig.Bytes())
138138
if !e.NoTxs() {
139139
// txs size
140-
w.U64fromZero(uint64(e.txs.Len()))
140+
w.U56(uint64(e.txs.Len()))
141141
// txs
142142
for _, tx := range e.txs {
143143
err := TransactionMarshalCSER(w, tx)
@@ -158,7 +158,7 @@ func (e *MutableEventPayload) UnmarshalCSER(r *cser.Reader) error {
158158
txs := types.Transactions{}
159159
if !e.NoTxs() {
160160
// txs size
161-
size := r.U64fromZero()
161+
size := r.U56()
162162
for i := uint64(0); i < size; i++ {
163163
tx, err := TransactionUnmarshalCSER(r)
164164
if err != nil {

‎utils/cser/binary_test.go‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,17 @@ func TestVals(t *testing.T) {
3636
err error
3737
)
3838
var (
39-
expBigInt = []*big.Int{big.NewInt(0), big.NewInt(0xFFFFF)}
40-
expBool = []bool{true, false}
41-
expFixedBytes = [][]byte{[]byte{}, randBytes(0xFF)}
42-
expSliceBytes = [][]byte{[]byte{}, randBytes(0xFF)}
43-
expU8 = []uint8{0, 1, 0xFF}
44-
expU16 = []uint16{0, 1, 0xFFFF}
45-
expU32 = []uint32{0, 1, 0xFFFFFFFF}
46-
expU64 = []uint64{0, 1, 0xFFFFFFFFFFFFFFFF}
47-
expVarUint = []uint64{0, 1, 0xFFFFFFFFFFFFFFFF}
48-
expI64 = []int64{0, 1, math.MinInt64, math.MaxInt64}
49-
expU64fromZero = []uint64{0, 1, 1<<(8*7) - 1}
39+
expBigInt = []*big.Int{big.NewInt(0), big.NewInt(0xFFFFF)}
40+
expBool = []bool{true, false}
41+
expFixedBytes = [][]byte{[]byte{}, randBytes(0xFF)}
42+
expSliceBytes = [][]byte{[]byte{}, randBytes(0xFF)}
43+
expU8 = []uint8{0, 1, 0xFF}
44+
expU16 = []uint16{0, 1, 0xFFFF}
45+
expU32 = []uint32{0, 1, 0xFFFFFFFF}
46+
expU64 = []uint64{0, 1, 0xFFFFFFFFFFFFFFFF}
47+
expVarUint = []uint64{0, 1, 0xFFFFFFFFFFFFFFFF}
48+
expI64 = []int64{0, 1, math.MinInt64, math.MaxInt64}
49+
expU56 = []uint64{0, 1, 1<<(8*7) - 1}
5050
)
5151

5252
t.Run("Write", func(t *testing.T) {
@@ -83,8 +83,8 @@ func TestVals(t *testing.T) {
8383
for _, v := range expI64 {
8484
w.I64(v)
8585
}
86-
for _, v := range expU64fromZero {
87-
w.U64fromZero(v)
86+
for _, v := range expU56 {
87+
w.U56(v)
8888
}
8989
return nil
9090
})
@@ -136,8 +136,8 @@ func TestVals(t *testing.T) {
136136
got := r.I64()
137137
require.Equal(exp, got, i)
138138
}
139-
for i, exp := range expU64fromZero {
140-
got := r.U64fromZero()
139+
for i, exp := range expU56 {
140+
got := r.U56()
141141
require.Equal(exp, got, i)
142142
}
143143
return nil
@@ -152,10 +152,10 @@ func TestBadVals(t *testing.T) {
152152
err error
153153
)
154154
var (
155-
expBigInt = []*big.Int{nil}
156-
expFixedBytes = [][]byte{nil}
157-
expSliceBytes = [][]byte{nil}
158-
expU64fromZero = []uint64{1 << (8 * 7), math.MaxUint64}
155+
expBigInt = []*big.Int{nil}
156+
expFixedBytes = [][]byte{nil}
157+
expSliceBytes = [][]byte{nil}
158+
expU56 = []uint64{1 << (8 * 7), math.MaxUint64}
159159
)
160160

161161
t.Run("Write", func(t *testing.T) {
@@ -173,9 +173,9 @@ func TestBadVals(t *testing.T) {
173173
for _, v := range expSliceBytes {
174174
w.SliceBytes(v)
175175
}
176-
for _, v := range expU64fromZero {
176+
for _, v := range expU56 {
177177
require.Panics(func() {
178-
w.U64fromZero(v)
178+
w.U56(v)
179179
})
180180
}
181181
return nil
@@ -201,7 +201,7 @@ func TestBadVals(t *testing.T) {
201201
require.NotEqual(exp, got, i)
202202
require.Equal(len(exp), len(got), i)
203203
}
204-
for _, _ = range expU64fromZero {
204+
for _, _ = range expU56 {
205205
// skip
206206
}
207207
return nil

‎utils/cser/read_writer.go‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -165,16 +165,13 @@ func (w *Writer) I64(v int64) {
165165
}
166166
}
167167

168-
func (r *Reader) U64fromZero() uint64 {
168+
func (r *Reader) U56() uint64 {
169169
return r.readU64_bits(0, 3)
170170
}
171171

172-
func (w *Writer) U64fromZero(v uint64) {
172+
func (w *Writer) U56(v uint64) {
173173
const max = 1<<(8*7) - 1
174174
if v > max {
175-
// Note: the true fix is to increase bitsForSize,
176-
// but it will lead to the need to change existing data.
177-
// So just limit max value.
178175
panic("Value too big")
179176
}
180177
w.writeU64_bits(0, 3, v)
@@ -204,7 +201,7 @@ func (w *Writer) FixedBytes(v []byte) {
204201

205202
func (r *Reader) SliceBytes() []byte {
206203
// read slice size
207-
size := r.U64fromZero()
204+
size := r.U56()
208205
buf := make([]byte, size)
209206
// read slice content
210207
r.FixedBytes(buf)
@@ -213,7 +210,7 @@ func (r *Reader) SliceBytes() []byte {
213210

214211
func (w *Writer) SliceBytes(v []byte) {
215212
// write slice size
216-
w.U64fromZero(uint64(len(v)))
213+
w.U56(uint64(len(v)))
217214
// write slice content
218215
w.FixedBytes(v)
219216
}

0 commit comments

Comments
 (0)