Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
Geth-Modification
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
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
张蕾
Geth-Modification
Commits
61acd18e
Commit
61acd18e
authored
Nov 01, 2016
by
Péter Szilágyi
Committed by
GitHub
Nov 01, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3218 from kenji-isuntv/develop
internal/debug, internal/ethapi, rpc, swarm/storage: go fmt
parents
4dc1fb92
d85d3c74
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
25 deletions
+24
-25
flags.go
internal/debug/flags.go
+1
-1
tracer.go
internal/ethapi/tracer.go
+22
-22
http.go
rpc/http.go
+1
-1
chunker_test.go
swarm/storage/chunker_test.go
+0
-1
No files found.
internal/debug/flags.go
View file @
61acd18e
...
...
@@ -53,7 +53,7 @@ var (
Value
:
6060
,
}
pprofAddrFlag
=
cli
.
StringFlag
{
Name
:
"pprofaddr"
,
Name
:
"pprofaddr"
,
Usage
:
"pprof HTTP server listening interface"
,
Value
:
"127.0.0.1"
,
}
...
...
internal/ethapi/tracer.go
View file @
61acd18e
...
...
@@ -167,17 +167,17 @@ func (dw *dbWrapper) toValue(vm *otto.Otto) otto.Value {
// JavascriptTracer provides an implementation of Tracer that evaluates a
// Javascript function for each VM execution step.
type
JavascriptTracer
struct
{
vm
*
otto
.
Otto
// Javascript VM instance
traceobj
*
otto
.
Object
// User-supplied object to call
log
map
[
string
]
interface
{}
// (Reusable) map for the `log` arg to `step`
logvalue
otto
.
Value
// JS view of `log`
memory
*
memoryWrapper
// Wrapper around the VM memory
memvalue
otto
.
Value
// JS view of `memory`
stack
*
stackWrapper
// Wrapper around the VM stack
stackvalue
otto
.
Value
// JS view of `stack`
db
*
dbWrapper
// Wrapper around the VM environment
dbvalue
otto
.
Value
// JS view of `db`
err
error
// Error, if one has occurred
vm
*
otto
.
Otto
// Javascript VM instance
traceobj
*
otto
.
Object
// User-supplied object to call
log
map
[
string
]
interface
{}
// (Reusable) map for the `log` arg to `step`
logvalue
otto
.
Value
// JS view of `log`
memory
*
memoryWrapper
// Wrapper around the VM memory
memvalue
otto
.
Value
// JS view of `memory`
stack
*
stackWrapper
// Wrapper around the VM stack
stackvalue
otto
.
Value
// JS view of `stack`
db
*
dbWrapper
// Wrapper around the VM environment
dbvalue
otto
.
Value
// JS view of `db`
err
error
// Error, if one has occurred
}
// NewJavascriptTracer instantiates a new JavascriptTracer instance.
...
...
@@ -222,17 +222,17 @@ func NewJavascriptTracer(code string) (*JavascriptTracer, error) {
db
:=
&
dbWrapper
{}
return
&
JavascriptTracer
{
vm
:
vm
,
traceobj
:
jstracer
,
log
:
log
,
logvalue
:
logvalue
,
memory
:
mem
,
memvalue
:
mem
.
toValue
(
vm
),
stack
:
stack
,
stackvalue
:
stack
.
toValue
(
vm
),
db
:
db
,
dbvalue
:
db
.
toValue
(
vm
),
err
:
nil
,
vm
:
vm
,
traceobj
:
jstracer
,
log
:
log
,
logvalue
:
logvalue
,
memory
:
mem
,
memvalue
:
mem
.
toValue
(
vm
),
stack
:
stack
,
stackvalue
:
stack
.
toValue
(
vm
),
db
:
db
,
dbvalue
:
db
.
toValue
(
vm
),
err
:
nil
,
},
nil
}
...
...
rpc/http.go
View file @
61acd18e
...
...
@@ -170,7 +170,7 @@ func newCorsHandler(srv *Server, corsString string) http.Handler {
c
:=
cors
.
New
(
cors
.
Options
{
AllowedOrigins
:
allowedOrigins
,
AllowedMethods
:
[]
string
{
"POST"
,
"GET"
},
MaxAge
:
600
,
MaxAge
:
600
,
})
return
c
.
Handler
(
srv
)
}
swarm/storage/chunker_test.go
View file @
61acd18e
...
...
@@ -28,7 +28,6 @@ import (
"time"
)
/*
Tests TreeChunker by splitting and joining a random byte slice
*/
...
...
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