Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
N
nebula
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
exchain
nebula
Commits
467fa165
Unverified
Commit
467fa165
authored
Mar 16, 2022
by
Conner Fromknecht
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: BSS properly handle Close error for zlib reader
parent
230ce603
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
3 deletions
+12
-3
encoding.go
go/batch-submitter/drivers/sequencer/encoding.go
+12
-3
No files found.
go/batch-submitter/drivers/sequencer/encoding.go
View file @
467fa165
...
@@ -328,14 +328,23 @@ func (p *AppendSequencerBatchParams) Read(r io.Reader) error {
...
@@ -328,14 +328,23 @@ func (p *AppendSequencerBatchParams) Read(r io.Reader) error {
p
.
Contexts
=
append
(
p
.
Contexts
,
batchContext
)
p
.
Contexts
=
append
(
p
.
Contexts
,
batchContext
)
}
}
// Handle newer batch type decodings.
// Define a closure to clean up the reader used by the specified encoding.
var
closeReader
func
()
error
switch
batchType
{
switch
batchType
{
// The legacy serialization does not require clsing, so we instatiate a
// dummy closure.
case
BatchTypeLegacy
:
closeReader
=
func
()
error
{
return
nil
}
// The zlib serialization requires decompression before reading the
// plaintext bytes, and also requires proper cleanup.
case
BatchTypeZlib
:
case
BatchTypeZlib
:
zr
,
err
:=
zlib
.
NewReader
(
r
)
zr
,
err
:=
zlib
.
NewReader
(
r
)
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
}
}
defer
zr
.
Close
()
closeReader
=
zr
.
Close
r
=
bufio
.
NewReader
(
zr
)
r
=
bufio
.
NewReader
(
zr
)
}
}
...
@@ -355,7 +364,7 @@ func (p *AppendSequencerBatchParams) Read(r io.Reader) error {
...
@@ -355,7 +364,7 @@ func (p *AppendSequencerBatchParams) Read(r io.Reader) error {
if
len
(
p
.
Txs
)
==
0
&&
len
(
p
.
Contexts
)
!=
0
{
if
len
(
p
.
Txs
)
==
0
&&
len
(
p
.
Contexts
)
!=
0
{
return
ErrMalformedBatch
return
ErrMalformedBatch
}
}
return
nil
return
closeReader
()
}
else
if
err
!=
nil
{
}
else
if
err
!=
nil
{
return
err
return
err
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment