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
61ede867
Commit
61ede867
authored
Mar 16, 2017
by
Péter Szilágyi
Committed by
Felix Lange
Mar 16, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
internal/ethapi: drop eth_compile (#3740)
parent
dc4c59d4
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
85 deletions
+1
-85
backend.go
internal/ethapi/backend.go
+1
-3
solc.go
internal/ethapi/solc.go
+0
-82
No files found.
internal/ethapi/backend.go
View file @
61ede867
...
...
@@ -73,8 +73,7 @@ type State interface {
}
func
GetAPIs
(
apiBackend
Backend
,
solcPath
string
)
[]
rpc
.
API
{
compiler
:=
makeCompilerAPIs
(
solcPath
)
all
:=
[]
rpc
.
API
{
return
[]
rpc
.
API
{
{
Namespace
:
"eth"
,
Version
:
"1.0"
,
...
...
@@ -116,5 +115,4 @@ func GetAPIs(apiBackend Backend, solcPath string) []rpc.API {
Public
:
false
,
},
}
return
append
(
compiler
,
all
...
)
}
internal/ethapi/solc.go
deleted
100644 → 0
View file @
dc4c59d4
// Copyright 2016 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// The go-ethereum library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public License
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
package
ethapi
import
(
"sync"
"github.com/ethereum/go-ethereum/common/compiler"
"github.com/ethereum/go-ethereum/rpc"
)
func
makeCompilerAPIs
(
solcPath
string
)
[]
rpc
.
API
{
c
:=
&
compilerAPI
{
solc
:
solcPath
}
return
[]
rpc
.
API
{
{
Namespace
:
"eth"
,
Version
:
"1.0"
,
Service
:
(
*
PublicCompilerAPI
)(
c
),
Public
:
true
,
},
{
Namespace
:
"admin"
,
Version
:
"1.0"
,
Service
:
(
*
CompilerAdminAPI
)(
c
),
Public
:
true
,
},
}
}
type
compilerAPI
struct
{
// This lock guards the solc path set through the API.
// It also ensures that only one solc process is used at
// any time.
mu
sync
.
Mutex
solc
string
}
type
CompilerAdminAPI
compilerAPI
// SetSolc sets the Solidity compiler path to be used by the node.
func
(
api
*
CompilerAdminAPI
)
SetSolc
(
path
string
)
(
string
,
error
)
{
api
.
mu
.
Lock
()
defer
api
.
mu
.
Unlock
()
info
,
err
:=
compiler
.
SolidityVersion
(
path
)
if
err
!=
nil
{
return
""
,
err
}
api
.
solc
=
path
return
info
.
FullVersion
,
nil
}
type
PublicCompilerAPI
compilerAPI
// CompileSolidity compiles the given solidity source.
func
(
api
*
PublicCompilerAPI
)
CompileSolidity
(
source
string
)
(
map
[
string
]
*
compiler
.
Contract
,
error
)
{
api
.
mu
.
Lock
()
defer
api
.
mu
.
Unlock
()
return
compiler
.
CompileSolidityString
(
api
.
solc
,
source
)
}
func
(
api
*
PublicCompilerAPI
)
GetCompilers
()
([]
string
,
error
)
{
api
.
mu
.
Lock
()
defer
api
.
mu
.
Unlock
()
if
_
,
err
:=
compiler
.
SolidityVersion
(
api
.
solc
);
err
==
nil
{
return
[]
string
{
"Solidity"
},
nil
}
return
[]
string
{},
nil
}
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