Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
B
burrow
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
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
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Hang Yu
burrow
Commits
d27a802e
Unverified
Commit
d27a802e
authored
8 years ago
by
Silas Davis
Browse files
Options
Downloads
Patches
Plain Diff
Get defer in the right place
parent
ed509af1
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
core/config.go
+1
-1
1 addition, 1 deletion
core/config.go
rpc/tendermint/test/common_test.go
+3
-3
3 additions, 3 deletions
rpc/tendermint/test/common_test.go
with
4 additions
and
4 deletions
core/config.go
+
1
−
1
View file @
d27a802e
...
...
@@ -54,7 +54,7 @@ func loadModuleConfigFromDo(do *definitions.Do, module string) (*config.ModuleCo
func
LoadModuleConfig
(
conf
*
viper
.
Viper
,
rootWorkDir
,
rootDataDir
,
genesisFile
,
chainId
,
module
string
)
(
*
config
.
ModuleConfig
,
error
)
{
moduleName
:=
conf
.
GetString
(
"chain."
+
module
+
".name"
)
fmt
.
Println
(
moduleName
)
fmt
.
Println
(
conf
)
majorVersion
:=
conf
.
GetInt
(
"chain."
+
module
+
".major_version"
)
minorVersion
:=
conf
.
GetInt
(
"chain."
+
module
+
".minor_version"
)
minorVersionString
:=
version
.
MakeMinorVersionString
(
moduleName
,
majorVersion
,
...
...
This diff is collapsed.
Click to expand it.
rpc/tendermint/test/common_test.go
+
3
−
3
View file @
d27a802e
...
...
@@ -9,6 +9,7 @@ import (
// Needs to be in a _test.go file to be picked up
func
TestMain
(
m
*
testing
.
M
)
{
ffs
:=
fixtures
.
NewFileFixtures
()
defer
ffs
.
RemoveAll
()
initGlobalVariables
(
ffs
)
...
...
@@ -16,17 +17,16 @@ func TestMain(m *testing.M) {
panic
(
ffs
.
Error
)
}
defer
ffs
.
RemoveAll
()
saveNewPriv
()
// start a node
ready
:=
make
(
chan
struct
{})
go
newNode
(
ready
)
<-
ready
returnValue
:=
m
.
Run
()
// start a node
os
.
Exit
(
returnValue
)
}
...
...
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