aboutsummaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorzelig <viktor.tron@gmail.com>2015-10-27 05:24:09 +0800
committerzelig <viktor.tron@gmail.com>2015-10-27 05:24:09 +0800
commit4d005a2c1d2929dc770acd3a2bfed59495c70557 (patch)
tree0442ccefd85cc8b692c2c58a5916bc997909657a /common
parent3b4ffacd0c63952ceda96b3fafb050c91e72b420 (diff)
downloaddexon-4d005a2c1d2929dc770acd3a2bfed59495c70557.tar
dexon-4d005a2c1d2929dc770acd3a2bfed59495c70557.tar.gz
dexon-4d005a2c1d2929dc770acd3a2bfed59495c70557.tar.bz2
dexon-4d005a2c1d2929dc770acd3a2bfed59495c70557.tar.lz
dexon-4d005a2c1d2929dc770acd3a2bfed59495c70557.tar.xz
dexon-4d005a2c1d2929dc770acd3a2bfed59495c70557.tar.zst
dexon-4d005a2c1d2929dc770acd3a2bfed59495c70557.zip
rpc api: eth_getNatSpec
* xeth, rpc: implement eth_getNatSpec for tx confirmations * rename silly docserver -> httpclient * eth/backend: httpclient now accessible via eth.Ethereum init-d via config.DocRoot * cmd: introduce separate CLI flag for DocRoot (defaults to homedir) * common/path: delete unused assetpath func, separate HomeDir func
Diffstat (limited to 'common')
-rw-r--r--common/httpclient/httpclient.go (renamed from common/docserver/docserver.go)48
-rw-r--r--common/httpclient/httpclient_test.go (renamed from common/docserver/docserver_test.go)20
-rw-r--r--common/natspec/natspec.go14
-rw-r--r--common/natspec/natspec_e2e_test.go6
-rw-r--r--common/path.go44
5 files changed, 52 insertions, 80 deletions
diff --git a/common/docserver/docserver.go b/common/httpclient/httpclient.go
index cfc4e3b26..23373ecaf 100644
--- a/common/docserver/docserver.go
+++ b/common/httpclient/httpclient.go
@@ -14,7 +14,7 @@
// 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 docserver
+package httpclient
import (
"fmt"
@@ -26,14 +26,14 @@ import (
"github.com/ethereum/go-ethereum/crypto"
)
-type DocServer struct {
+type HTTPClient struct {
*http.Transport
DocRoot string
schemes []string
}
-func New(docRoot string) (self *DocServer) {
- self = &DocServer{
+func New(docRoot string) (self *HTTPClient) {
+ self = &HTTPClient{
Transport: &http.Transport{},
DocRoot: docRoot,
schemes: []string{"file"},
@@ -46,18 +46,18 @@ func New(docRoot string) (self *DocServer) {
// A Client is higher-level than a RoundTripper (such as Transport) and additionally handles HTTP details such as cookies and redirects.
-func (self *DocServer) Client() *http.Client {
+func (self *HTTPClient) Client() *http.Client {
return &http.Client{
Transport: self,
}
}
-func (self *DocServer) RegisterScheme(scheme string, rt http.RoundTripper) {
+func (self *HTTPClient) RegisterScheme(scheme string, rt http.RoundTripper) {
self.schemes = append(self.schemes, scheme)
self.RegisterProtocol(scheme, rt)
}
-func (self *DocServer) HasScheme(scheme string) bool {
+func (self *HTTPClient) HasScheme(scheme string) bool {
for _, s := range self.schemes {
if s == scheme {
return true
@@ -66,43 +66,41 @@ func (self *DocServer) HasScheme(scheme string) bool {
return false
}
-func (self *DocServer) GetAuthContent(uri string, hash common.Hash) (content []byte, err error) {
+func (self *HTTPClient) GetAuthContent(uri string, hash common.Hash) ([]byte, error) {
// retrieve content
- content, err = self.Get(uri, "")
+ content, err := self.Get(uri, "")
if err != nil {
- return
+ return nil, err
}
// check hash to authenticate content
chash := crypto.Sha3Hash(content)
if chash != hash {
- content = nil
- err = fmt.Errorf("content hash mismatch %x != %x (exp)", hash[:], chash[:])
+ return nil, fmt.Errorf("content hash mismatch %x != %x (exp)", hash[:], chash[:])
}
- return
+ return content, nil
}
// Get(uri, path) downloads the document at uri, if path is non-empty it
// is interpreted as a filepath to which the contents are saved
-func (self *DocServer) Get(uri, path string) (content []byte, err error) {
+func (self *HTTPClient) Get(uri, path string) ([]byte, error) {
// retrieve content
resp, err := self.Client().Get(uri)
-
+ if err != nil {
+ return nil, err
+ }
defer func() {
if resp != nil {
resp.Body.Close()
}
}()
- if err != nil {
- return
- }
-
+ var content []byte
content, err = ioutil.ReadAll(resp.Body)
if err != nil {
- return
+ return nil, err
}
if resp.StatusCode/100 != 2 {
@@ -112,9 +110,15 @@ func (self *DocServer) Get(uri, path string) (content []byte, err error) {
if path != "" {
var abspath string
abspath, err = filepath.Abs(path)
- ioutil.WriteFile(abspath, content, 0700)
+ if err != nil {
+ return nil, err
+ }
+ err = ioutil.WriteFile(abspath, content, 0600)
+ if err != nil {
+ return nil, err
+ }
}
- return
+ return content, nil
}
diff --git a/common/docserver/docserver_test.go b/common/httpclient/httpclient_test.go
index 632603add..6c3782e15 100644
--- a/common/docserver/docserver_test.go
+++ b/common/httpclient/httpclient_test.go
@@ -14,7 +14,7 @@
// 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 docserver
+package httpclient
import (
"io/ioutil"
@@ -28,19 +28,19 @@ import (
)
func TestGetAuthContent(t *testing.T) {
- dir, err := ioutil.TempDir("", "docserver-test")
+ dir, err := ioutil.TempDir("", "httpclient-test")
if err != nil {
t.Fatal("cannot create temporary directory:", err)
}
defer os.RemoveAll(dir)
- ds := New(dir)
+ client := New(dir)
text := "test"
hash := crypto.Sha3Hash([]byte(text))
if err := ioutil.WriteFile(path.Join(dir, "test.content"), []byte(text), os.ModePerm); err != nil {
t.Fatal("could not write test file", err)
}
- content, err := ds.GetAuthContent("file:///test.content", hash)
+ content, err := client.GetAuthContent("file:///test.content", hash)
if err != nil {
t.Errorf("no error expected, got %v", err)
}
@@ -49,7 +49,7 @@ func TestGetAuthContent(t *testing.T) {
}
hash = common.Hash{}
- content, err = ds.GetAuthContent("file:///test.content", hash)
+ content, err = client.GetAuthContent("file:///test.content", hash)
expected := "content hash mismatch 0000000000000000000000000000000000000000000000000000000000000000 != 9c22ff5f21f0b81b113e63f7db6da94fedef11b2119b4088b89664fb9a3cb658 (exp)"
if err == nil {
t.Errorf("expected error, got nothing")
@@ -66,12 +66,12 @@ type rt struct{}
func (rt) RoundTrip(req *http.Request) (resp *http.Response, err error) { return }
func TestRegisterScheme(t *testing.T) {
- ds := New("/tmp/")
- if ds.HasScheme("scheme") {
+ client := New("/tmp/")
+ if client.HasScheme("scheme") {
t.Errorf("expected scheme not to be registered")
}
- ds.RegisterScheme("scheme", rt{})
- if !ds.HasScheme("scheme") {
+ client.RegisterScheme("scheme", rt{})
+ if !client.HasScheme("scheme") {
t.Errorf("expected scheme to be registered")
}
-} \ No newline at end of file
+}
diff --git a/common/natspec/natspec.go b/common/natspec/natspec.go
index 0265c2e13..d9627b4e1 100644
--- a/common/natspec/natspec.go
+++ b/common/natspec/natspec.go
@@ -23,7 +23,7 @@ import (
"strings"
"github.com/ethereum/go-ethereum/common"
- "github.com/ethereum/go-ethereum/common/docserver"
+ "github.com/ethereum/go-ethereum/common/httpclient"
"github.com/ethereum/go-ethereum/common/registrar"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/xeth"
@@ -43,7 +43,7 @@ type NatSpec struct {
// the implementation is frontend friendly in that it always gives back
// a notice that is safe to display
// :FIXME: the second return value is an error, which can be used to fine-tune bahaviour
-func GetNotice(xeth *xeth.XEth, tx string, http *docserver.DocServer) (notice string) {
+func GetNotice(xeth *xeth.XEth, tx string, http *httpclient.HTTPClient) (notice string) {
ns, err := New(xeth, tx, http)
if err != nil {
if ns == nil {
@@ -83,7 +83,7 @@ type contractInfo struct {
DeveloperDoc json.RawMessage `json:"developerDoc"`
}
-func New(xeth *xeth.XEth, jsontx string, http *docserver.DocServer) (self *NatSpec, err error) {
+func New(xeth *xeth.XEth, jsontx string, http *httpclient.HTTPClient) (self *NatSpec, err error) {
// extract contract address from tx
var tx jsonTx
@@ -104,7 +104,7 @@ func New(xeth *xeth.XEth, jsontx string, http *docserver.DocServer) (self *NatSp
}
// also called by admin.contractInfo.get
-func FetchDocsForContract(contractAddress string, xeth *xeth.XEth, ds *docserver.DocServer) (content []byte, err error) {
+func FetchDocsForContract(contractAddress string, xeth *xeth.XEth, client *httpclient.HTTPClient) (content []byte, err error) {
// retrieve contract hash from state
codehex := xeth.CodeAt(contractAddress)
codeb := xeth.CodeAtBytes(contractAddress)
@@ -122,8 +122,8 @@ func FetchDocsForContract(contractAddress string, xeth *xeth.XEth, ds *docserver
if err != nil {
return
}
- if ds.HasScheme("bzz") {
- content, err = ds.Get("bzz://"+hash.Hex()[2:], "")
+ if client.HasScheme("bzz") {
+ content, err = client.Get("bzz://"+hash.Hex()[2:], "")
if err == nil { // non-fatal
return
}
@@ -137,7 +137,7 @@ func FetchDocsForContract(contractAddress string, xeth *xeth.XEth, ds *docserver
}
// get content via http client and authenticate content using hash
- content, err = ds.GetAuthContent(uri, hash)
+ content, err = client.GetAuthContent(uri, hash)
if err != nil {
return
}
diff --git a/common/natspec/natspec_e2e_test.go b/common/natspec/natspec_e2e_test.go
index 4149314c3..706a294ec 100644
--- a/common/natspec/natspec_e2e_test.go
+++ b/common/natspec/natspec_e2e_test.go
@@ -28,7 +28,7 @@ import (
"github.com/ethereum/go-ethereum/accounts"
"github.com/ethereum/go-ethereum/common"
- "github.com/ethereum/go-ethereum/common/docserver"
+ "github.com/ethereum/go-ethereum/common/httpclient"
"github.com/ethereum/go-ethereum/common/registrar"
"github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/crypto"
@@ -113,8 +113,8 @@ func (self *testFrontend) UnlockAccount(acc []byte) bool {
func (self *testFrontend) ConfirmTransaction(tx string) bool {
if self.wantNatSpec {
- ds := docserver.New("/tmp/")
- self.lastConfirm = GetNotice(self.xeth, tx, ds)
+ client := httpclient.New("/tmp/")
+ self.lastConfirm = GetNotice(self.xeth, tx, client)
}
return true
}
diff --git a/common/path.go b/common/path.go
index 1253c424c..39eacacee 100644
--- a/common/path.go
+++ b/common/path.go
@@ -23,8 +23,6 @@ import (
"path/filepath"
"runtime"
"strings"
-
- "github.com/kardianos/osext"
)
// MakeName creates a node name that follows the ethereum convention
@@ -65,48 +63,18 @@ func AbsolutePath(Datadir string, filename string) string {
return filepath.Join(Datadir, filename)
}
-func DefaultAssetPath() string {
- var assetPath string
- pwd, _ := os.Getwd()
- srcdir := filepath.Join(os.Getenv("GOPATH"), "src", "github.com", "ethereum", "go-ethereum", "cmd", "mist")
-
- // If the current working directory is the go-ethereum dir
- // assume a debug build and use the source directory as
- // asset directory.
- if pwd == srcdir {
- assetPath = filepath.Join(pwd, "assets")
+func HomeDir() (home string) {
+ if usr, err := user.Current(); err == nil {
+ home = usr.HomeDir
} else {
- switch runtime.GOOS {
- case "darwin":
- // Get Binary Directory
- exedir, _ := osext.ExecutableFolder()
- assetPath = filepath.Join(exedir, "..", "Resources")
- case "linux":
- assetPath = filepath.Join("usr", "share", "mist")
- case "windows":
- assetPath = filepath.Join(".", "assets")
- default:
- assetPath = "."
- }
- }
-
- // Check if the assetPath exists. If not, try the source directory
- // This happens when binary is run from outside cmd/mist directory
- if _, err := os.Stat(assetPath); os.IsNotExist(err) {
- assetPath = filepath.Join(srcdir, "assets")
+ home = os.Getenv("HOME")
}
-
- return assetPath
+ return
}
func DefaultDataDir() string {
// Try to place the data folder in the user's home dir
- var home string
- if usr, err := user.Current(); err == nil {
- home = usr.HomeDir
- } else {
- home = os.Getenv("HOME")
- }
+ home := HomeDir()
if home != "" {
if runtime.GOOS == "darwin" {
return filepath.Join(home, "Library", "Ethereum")