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
60c3439b
Commit
60c3439b
authored
Jul 09, 2023
by
Sergey Demyanov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add txmgr constructor with Config
parent
f540cf18
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
48 additions
and
1 deletion
+48
-1
cli.go
op-service/txmgr/cli.go
+31
-0
txmgr.go
op-service/txmgr/txmgr.go
+7
-0
txmgr_test.go
op-service/txmgr/txmgr_test.go
+10
-1
No files found.
op-service/txmgr/cli.go
View file @
60c3439b
...
...
@@ -290,3 +290,34 @@ type Config struct {
Signer
opcrypto
.
SignerFn
From
common
.
Address
}
func
(
m
Config
)
Check
()
error
{
if
m
.
Backend
==
nil
{
return
errors
.
New
(
"must provide the Backend"
)
}
if
m
.
NumConfirmations
==
0
{
return
errors
.
New
(
"NumConfirmations must not be 0"
)
}
if
m
.
NetworkTimeout
==
0
{
return
errors
.
New
(
"must provide NetworkTimeout"
)
}
if
m
.
ResubmissionTimeout
==
0
{
return
errors
.
New
(
"must provide ResubmissionTimeout"
)
}
if
m
.
ReceiptQueryInterval
==
0
{
return
errors
.
New
(
"must provide ReceiptQueryInterval"
)
}
if
m
.
TxNotInMempoolTimeout
==
0
{
return
errors
.
New
(
"must provide TxNotInMempoolTimeout"
)
}
if
m
.
SafeAbortNonceTooLowCount
==
0
{
return
errors
.
New
(
"SafeAbortNonceTooLowCount must not be 0"
)
}
if
m
.
Signer
==
nil
{
return
errors
.
New
(
"must provide the Signer"
)
}
if
m
.
ChainID
==
nil
{
return
errors
.
New
(
"must provide the ChainID"
)
}
return
nil
}
op-service/txmgr/txmgr.go
View file @
60c3439b
...
...
@@ -112,7 +112,14 @@ func NewSimpleTxManager(name string, l log.Logger, m metrics.TxMetricer, cfg CLI
if
err
!=
nil
{
return
nil
,
err
}
return
NewSimpleTxManagerFromConfig
(
name
,
l
,
m
,
conf
)
}
// NewSimpleTxManager initializes a new SimpleTxManager with the passed Config.
func
NewSimpleTxManagerFromConfig
(
name
string
,
l
log
.
Logger
,
m
metrics
.
TxMetricer
,
conf
Config
)
(
*
SimpleTxManager
,
error
)
{
if
err
:=
conf
.
Check
();
err
!=
nil
{
return
nil
,
fmt
.
Errorf
(
"invalid config: %w"
,
err
)
}
return
&
SimpleTxManager
{
chainID
:
conf
.
ChainID
,
name
:
name
,
...
...
op-service/txmgr/txmgr_test.go
View file @
60c3439b
...
...
@@ -603,12 +603,21 @@ func TestWaitMinedMultipleConfs(t *testing.T) {
require
.
Equal
(
t
,
txHash
,
receipt
.
TxHash
)
}
// TestManagerErrsOnZeroCLIConfs ensures that the NewSimpleTxManager will error
// when attempting to configure with NumConfirmations set to zero.
func
TestManagerErrsOnZeroCLIConfs
(
t
*
testing
.
T
)
{
t
.
Parallel
()
_
,
err
:=
NewSimpleTxManager
(
"TEST"
,
testlog
.
Logger
(
t
,
log
.
LvlCrit
),
&
metrics
.
NoopTxMetrics
{},
CLIConfig
{})
require
.
Error
(
t
,
err
)
}
// TestManagerErrsOnZeroConfs ensures that the NewSimpleTxManager will error
// when attempting to configure with NumConfirmations set to zero.
func
TestManagerErrsOnZeroConfs
(
t
*
testing
.
T
)
{
t
.
Parallel
()
_
,
err
:=
NewSimpleTxManager
(
"TEST"
,
testlog
.
Logger
(
t
,
log
.
LvlCrit
),
&
metrics
.
NoopTxMetrics
{},
CLI
Config
{})
_
,
err
:=
NewSimpleTxManager
FromConfig
(
"TEST"
,
testlog
.
Logger
(
t
,
log
.
LvlCrit
),
&
metrics
.
NoopTxMetrics
{},
Config
{})
require
.
Error
(
t
,
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