aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBas van Kervel <basvankervel@gmail.com>2017-01-17 18:35:07 +0800
committerBas van Kervel <basvankervel@gmail.com>2017-01-17 19:13:50 +0800
commit54a65e6d87800ba5ecb8a14621d4aff0bfa56ada (patch)
tree92463956d946655c9ba04f7505a7911dea1f919a
parent26d385c18b5eb003d9a69ff618c78acbe594db44 (diff)
downloaddexon-54a65e6d87800ba5ecb8a14621d4aff0bfa56ada.tar
dexon-54a65e6d87800ba5ecb8a14621d4aff0bfa56ada.tar.gz
dexon-54a65e6d87800ba5ecb8a14621d4aff0bfa56ada.tar.bz2
dexon-54a65e6d87800ba5ecb8a14621d4aff0bfa56ada.tar.lz
dexon-54a65e6d87800ba5ecb8a14621d4aff0bfa56ada.tar.xz
dexon-54a65e6d87800ba5ecb8a14621d4aff0bfa56ada.tar.zst
dexon-54a65e6d87800ba5ecb8a14621d4aff0bfa56ada.zip
cmd,eth,les,internal: remove natspec support
-rw-r--r--cmd/geth/main.go1
-rw-r--r--cmd/geth/usage.go1
-rw-r--r--cmd/utils/flags.go5
-rw-r--r--common/compiler/solidity_test.go4
-rw-r--r--eth/backend.go3
-rw-r--r--internal/web3ext/web3ext.go6
-rw-r--r--les/backend.go2
-rw-r--r--swarm/api/http/roundtripper.go4
8 files changed, 3 insertions, 23 deletions
diff --git a/cmd/geth/main.go b/cmd/geth/main.go
index a6b6331df..bcaf2adef 100644
--- a/cmd/geth/main.go
+++ b/cmd/geth/main.go
@@ -106,7 +106,6 @@ func init() {
utils.AutoDAGFlag,
utils.TargetGasLimitFlag,
utils.NATFlag,
- utils.NatspecEnabledFlag,
utils.NoDiscoverFlag,
utils.DiscoveryV5Flag,
utils.NetrestrictFlag,
diff --git a/cmd/geth/usage.go b/cmd/geth/usage.go
index 853307604..759e0737d 100644
--- a/cmd/geth/usage.go
+++ b/cmd/geth/usage.go
@@ -169,7 +169,6 @@ var AppHelpFlagGroups = []flagGroup{
Name: "EXPERIMENTAL",
Flags: []cli.Flag{
utils.WhisperEnabledFlag,
- utils.NatspecEnabledFlag,
},
},
{
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index 01114a957..ad7e6da6e 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -130,10 +130,6 @@ var (
Name: "identity",
Usage: "Custom node name",
}
- NatspecEnabledFlag = cli.BoolFlag{
- Name: "natspec",
- Usage: "Enable NatSpec confirmation notice",
- }
DocRootFlag = DirectoryFlag{
Name: "docroot",
Usage: "Document Root for HTTPClient file scheme",
@@ -730,7 +726,6 @@ func RegisterEthService(ctx *cli.Context, stack *node.Node, extra []byte) {
NetworkId: ctx.GlobalInt(NetworkIdFlag.Name),
MinerThreads: ctx.GlobalInt(MinerThreadsFlag.Name),
ExtraData: MakeMinerExtra(extra, ctx),
- NatSpec: ctx.GlobalBool(NatspecEnabledFlag.Name),
DocRoot: ctx.GlobalString(DocRootFlag.Name),
GasPrice: common.String2Big(ctx.GlobalString(GasPriceFlag.Name)),
GpoMinGasPrice: common.String2Big(ctx.GlobalString(GpoMinGasPriceFlag.Name)),
diff --git a/common/compiler/solidity_test.go b/common/compiler/solidity_test.go
index 8ba9e55d0..f16637547 100644
--- a/common/compiler/solidity_test.go
+++ b/common/compiler/solidity_test.go
@@ -36,7 +36,7 @@ contract test {
}
}
`
- testInfo = `{"source":"\ncontract test {\n /// @notice Will multiply ` + "`a`" + ` by 7.\n function multiply(uint a) returns(uint d) {\n return a * 7;\n }\n}\n","language":"Solidity","languageVersion":"0.1.1","compilerVersion":"0.1.1","compilerOptions":"--binary file --json-abi file --natspec-user file --natspec-dev file --add-std 1","abiDefinition":[{"constant":false,"inputs":[{"name":"a","type":"uint256"}],"name":"multiply","outputs":[{"name":"d","type":"uint256"}],"type":"function"}],"userDoc":{"methods":{"multiply(uint256)":{"notice":"Will multiply ` + "`a`" + ` by 7."}}},"developerDoc":{"methods":{}}}`
+ testInfo = `{"source":"\ncontract test {\n /// @notice Will multiply ` + "`a`" + ` by 7.\n function multiply(uint a) returns(uint d) {\n return a * 7;\n }\n}\n","language":"Solidity","languageVersion":"0.1.1","compilerVersion":"0.1.1","compilerOptions":"--binary file --json-abi file --add-std 1","abiDefinition":[{"constant":false,"inputs":[{"name":"a","type":"uint256"}],"name":"multiply","outputs":[{"name":"d","type":"uint256"}],"type":"function"}],"userDoc":{"methods":{"multiply(uint256)":{"notice":"Will multiply ` + "`a`" + ` by 7."}}},"developerDoc":{"methods":{}}}`
)
func skipWithoutSolc(t *testing.T) {
@@ -99,7 +99,7 @@ func TestSaveInfo(t *testing.T) {
if string(got) != testInfo {
t.Errorf("incorrect info.json extracted, expected:\n%s\ngot\n%s", testInfo, string(got))
}
- wantHash := common.HexToHash("0x9f3803735e7f16120c5a140ab3f02121fd3533a9655c69b33a10e78752cc49b0")
+ wantHash := common.HexToHash("0x22450a77f0c3ff7a395948d07bc1456881226a1b6325f4189cb5f1254a824080")
if cinfohash != wantHash {
t.Errorf("content hash for info is incorrect. expected %v, got %v", wantHash.Hex(), cinfohash.Hex())
}
diff --git a/eth/backend.go b/eth/backend.go
index dec8c0c6e..a77b21026 100644
--- a/eth/backend.go
+++ b/eth/backend.go
@@ -77,7 +77,6 @@ type Config struct {
DatabaseCache int
DatabaseHandles int
- NatSpec bool
DocRoot string
AutoDAG bool
PowFake bool
@@ -140,7 +139,6 @@ type Ethereum struct {
etherbase common.Address
solcPath string
- NatSpec bool
netVersionId int
netRPCService *ethapi.PublicNetAPI
}
@@ -174,7 +172,6 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) {
shutdownChan: make(chan bool),
stopDbUpgrade: stopDbUpgrade,
netVersionId: config.NetworkId,
- NatSpec: config.NatSpec,
etherbase: config.Etherbase,
MinerThreads: config.MinerThreads,
AutoDAG: config.AutoDAG,
diff --git a/internal/web3ext/web3ext.go b/internal/web3ext/web3ext.go
index 12bdb6996..5241cda0a 100644
--- a/internal/web3ext/web3ext.go
+++ b/internal/web3ext/web3ext.go
@@ -409,12 +409,6 @@ web3._extend({
inputFormatter: [web3._extend.formatters.inputTransactionFormatter, web3._extend.utils.fromDecimal, web3._extend.utils.fromDecimal]
}),
new web3._extend.Method({
- name: 'getNatSpec',
- call: 'eth_getNatSpec',
- params: 1,
- inputFormatter: [web3._extend.formatters.inputTransactionFormatter]
- }),
- new web3._extend.Method({
name: 'signTransaction',
call: 'eth_signTransaction',
params: 1,
diff --git a/les/backend.go b/les/backend.go
index 3deab61f7..21ee08498 100644
--- a/les/backend.go
+++ b/les/backend.go
@@ -66,7 +66,6 @@ type LightEthereum struct {
solcPath string
solc *compiler.Solidity
- NatSpec bool
netVersionId int
netRPCService *ethapi.PublicNetAPI
}
@@ -95,7 +94,6 @@ func New(ctx *node.ServiceContext, config *eth.Config) (*LightEthereum, error) {
pow: pow,
shutdownChan: make(chan bool),
netVersionId: config.NetworkId,
- NatSpec: config.NatSpec,
solcPath: config.SolcPath,
}
diff --git a/swarm/api/http/roundtripper.go b/swarm/api/http/roundtripper.go
index a3a644b73..7b5bbc883 100644
--- a/swarm/api/http/roundtripper.go
+++ b/swarm/api/http/roundtripper.go
@@ -44,9 +44,7 @@ If Host is left empty, localhost is assumed.
Using a public gateway, the above few lines gives you the leanest
bzz-scheme aware read-only http client. You really only ever need this
-if you need go-native swarm access to bzz addresses, e.g.,
-github.com/ethereum/go-ethereum/common/natspec
-
+if you need go-native swarm access to bzz addresses.
*/
type RoundTripper struct {