Skip to content

Commit 42b81f9

Browse files
skylenetkaralabe
authored andcommitted
swarm: code cleanup, move to ethersphere/swarm (ethereum#19661)
1 parent 15f24ff commit 42b81f9

File tree

361 files changed

+22
-87054
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

361 files changed

+22
-87054
lines changed

.travis.yml

+6-15
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ matrix:
6464
- go run build/ci.go lint
6565

6666
# This builder does the Ubuntu PPA upload
67-
- if: repo = ethereum/go-ethereum AND type = push
67+
- if: type = push
6868
os: linux
6969
dist: xenial
7070
go: 1.12.x
@@ -86,7 +86,7 @@ matrix:
8686
- go run build/ci.go debsrc -upload ethereum/ethereum -sftp-user geth-ci -signer "Go Ethereum Linux Builder <geth-ci@ethereum.org>"
8787

8888
# This builder does the Linux Azure uploads
89-
- if: repo = ethereum/go-ethereum AND type = push
89+
- if: type = push
9090
os: linux
9191
dist: xenial
9292
sudo: required
@@ -120,7 +120,7 @@ matrix:
120120
- go run build/ci.go archive -arch arm64 -type tar -signer LINUX_SIGNING_KEY -upload gethstore/builds
121121

122122
# This builder does the Linux Azure MIPS xgo uploads
123-
- if: repo = ethereum/go-ethereum AND type = push
123+
- if: type = push
124124
os: linux
125125
dist: xenial
126126
services:
@@ -148,7 +148,7 @@ matrix:
148148
- go run build/ci.go archive -arch mips64le -type tar -signer LINUX_SIGNING_KEY -upload gethstore/builds
149149

150150
# This builder does the Android Maven and Azure uploads
151-
- if: repo = ethereum/go-ethereum AND type = push
151+
- if: type = push
152152
os: linux
153153
dist: xenial
154154
addons:
@@ -185,7 +185,7 @@ matrix:
185185
- go run build/ci.go aar -signer ANDROID_SIGNING_KEY -deploy https://oss.sonatype.org -upload gethstore/builds
186186

187187
# This builder does the OSX Azure, iOS CocoaPods and iOS Azure uploads
188-
- if: repo = ethereum/go-ethereum AND type = push
188+
- if: type = push
189189
os: osx
190190
go: 1.12.x
191191
env:
@@ -214,7 +214,7 @@ matrix:
214214
- go run build/ci.go xcode -signer IOS_SIGNING_KEY -deploy trunk -upload gethstore/builds
215215

216216
# This builder does the Azure archive purges to avoid accumulating junk
217-
- if: repo = ethereum/go-ethereum AND type = cron
217+
- if: type = cron
218218
os: linux
219219
dist: xenial
220220
go: 1.12.x
@@ -224,12 +224,3 @@ matrix:
224224
submodules: false # avoid cloning ethereum/tests
225225
script:
226226
- go run build/ci.go purge -store gethstore/builds -days 14
227-
228-
- name: Race Detector for Swarm
229-
if: repo = ethersphere/go-ethereum
230-
os: linux
231-
dist: xenial
232-
go: 1.12.x
233-
git:
234-
submodules: false # avoid cloning ethereum/tests
235-
script: ./build/travis_keepalive.sh go test -timeout 20m -race ./swarm... ./p2p/{protocols,simulations,testing}/...

Makefile

+1-9
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# with Go source code. If you know what GOPATH is then you probably
33
# don't need to bother with make.
44

5-
.PHONY: geth android ios geth-cross swarm evm all test clean
5+
.PHONY: geth android ios geth-cross evm all test clean
66
.PHONY: geth-linux geth-linux-386 geth-linux-amd64 geth-linux-mips64 geth-linux-mips64le
77
.PHONY: geth-linux-arm geth-linux-arm-5 geth-linux-arm-6 geth-linux-arm-7 geth-linux-arm64
88
.PHONY: geth-darwin geth-darwin-386 geth-darwin-amd64
@@ -16,11 +16,6 @@ geth:
1616
@echo "Done building."
1717
@echo "Run \"$(GOBIN)/geth\" to launch geth."
1818

19-
swarm:
20-
build/env.sh go run build/ci.go install ./cmd/swarm
21-
@echo "Done building."
22-
@echo "Run \"$(GOBIN)/swarm\" to launch swarm."
23-
2419
all:
2520
build/env.sh go run build/ci.go install
2621

@@ -57,9 +52,6 @@ devtools:
5752
@type "solc" 2> /dev/null || echo 'Please install solc'
5853
@type "protoc" 2> /dev/null || echo 'Please install protoc'
5954

60-
swarm-devtools:
61-
env GOBIN= go install ./cmd/swarm/mimegen
62-
6355
# Cross Compilation Targets (xgo)
6456

6557
geth-cross: geth-linux geth-darwin geth-windows geth-android geth-ios

README.md

+10-11
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,15 @@ or, to build the full suite of utilities:
3232

3333
The go-ethereum project comes with several wrappers/executables found in the `cmd` directory.
3434

35-
| Command | Description |
36-
|:----------:|-------------|
37-
| **`geth`** | Our main Ethereum CLI client. It is the entry point into the Ethereum network (main-, test- or private net), capable of running as a full node (default), archive node (retaining all historical state) or a light node (retrieving data live). It can be used by other processes as a gateway into the Ethereum network via JSON RPC endpoints exposed on top of HTTP, WebSocket and/or IPC transports. `geth --help` and the [CLI Wiki page](https://github.com/ethereum/go-ethereum/wiki/Command-Line-Options) for command line options. |
38-
| `abigen` | Source code generator to convert Ethereum contract definitions into easy to use, compile-time type-safe Go packages. It operates on plain [Ethereum contract ABIs](https://github.com/ethereum/wiki/wiki/Ethereum-Contract-ABI) with expanded functionality if the contract bytecode is also available. However, it also accepts Solidity source files, making development much more streamlined. Please see our [Native DApps](https://github.com/ethereum/go-ethereum/wiki/Native-DApps:-Go-bindings-to-Ethereum-contracts) wiki page for details. |
39-
| `bootnode` | Stripped down version of our Ethereum client implementation that only takes part in the network node discovery protocol, but does not run any of the higher level application protocols. It can be used as a lightweight bootstrap node to aid in finding peers in private networks. |
40-
| `evm` | Developer utility version of the EVM (Ethereum Virtual Machine) that is capable of running bytecode snippets within a configurable environment and execution mode. Its purpose is to allow isolated, fine-grained debugging of EVM opcodes (e.g. `evm --code 60ff60ff --debug`). |
41-
| `gethrpctest` | Developer utility tool to support our [ethereum/rpc-test](https://github.com/ethereum/rpc-tests) test suite which validates baseline conformity to the [Ethereum JSON RPC](https://github.com/ethereum/wiki/wiki/JSON-RPC) specs. Please see the [test suite's readme](https://github.com/ethereum/rpc-tests/blob/master/README.md) for details. |
42-
| `rlpdump` | Developer utility tool to convert binary RLP ([Recursive Length Prefix](https://github.com/ethereum/wiki/wiki/RLP)) dumps (data encoding used by the Ethereum protocol both network as well as consensus wise) to user-friendlier hierarchical representation (e.g. `rlpdump --hex CE0183FFFFFFC4C304050583616263`). |
43-
| `swarm` | Swarm daemon and tools. This is the entry point for the Swarm network. `swarm --help` for command line options and subcommands. See [Swarm README](https://github.com/ethereum/go-ethereum/tree/master/swarm) for more information. |
44-
| `puppeth` | a CLI wizard that aids in creating a new Ethereum network. |
35+
| Command | Description |
36+
| :-----------: | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
37+
| **`geth`** | Our main Ethereum CLI client. It is the entry point into the Ethereum network (main-, test- or private net), capable of running as a full node (default), archive node (retaining all historical state) or a light node (retrieving data live). It can be used by other processes as a gateway into the Ethereum network via JSON RPC endpoints exposed on top of HTTP, WebSocket and/or IPC transports. `geth --help` and the [CLI Wiki page](https://github.com/ethereum/go-ethereum/wiki/Command-Line-Options) for command line options. |
38+
| `abigen` | Source code generator to convert Ethereum contract definitions into easy to use, compile-time type-safe Go packages. It operates on plain [Ethereum contract ABIs](https://github.com/ethereum/wiki/wiki/Ethereum-Contract-ABI) with expanded functionality if the contract bytecode is also available. However, it also accepts Solidity source files, making development much more streamlined. Please see our [Native DApps](https://github.com/ethereum/go-ethereum/wiki/Native-DApps:-Go-bindings-to-Ethereum-contracts) wiki page for details. |
39+
| `bootnode` | Stripped down version of our Ethereum client implementation that only takes part in the network node discovery protocol, but does not run any of the higher level application protocols. It can be used as a lightweight bootstrap node to aid in finding peers in private networks. |
40+
| `evm` | Developer utility version of the EVM (Ethereum Virtual Machine) that is capable of running bytecode snippets within a configurable environment and execution mode. Its purpose is to allow isolated, fine-grained debugging of EVM opcodes (e.g. `evm --code 60ff60ff --debug`). |
41+
| `gethrpctest` | Developer utility tool to support our [ethereum/rpc-test](https://github.com/ethereum/rpc-tests) test suite which validates baseline conformity to the [Ethereum JSON RPC](https://github.com/ethereum/wiki/wiki/JSON-RPC) specs. Please see the [test suite's readme](https://github.com/ethereum/rpc-tests/blob/master/README.md) for details. |
42+
| `rlpdump` | Developer utility tool to convert binary RLP ([Recursive Length Prefix](https://github.com/ethereum/wiki/wiki/RLP)) dumps (data encoding used by the Ethereum protocol both network as well as consensus wise) to user-friendlier hierarchical representation (e.g. `rlpdump --hex CE0183FFFFFFC4C304050583616263`). |
43+
| `puppeth` | a CLI wizard that aids in creating a new Ethereum network. |
4544

4645
## Running geth
4746

@@ -95,7 +94,7 @@ Specifying the `--testnet` flag, however, will reconfigure your Geth instance a
9594
`geth attach <datadir>/testnet/geth.ipc`. Windows users are not affected by this.
9695
* Instead of connecting the main Ethereum network, the client will connect to the test network,
9796
which uses different P2P bootnodes, different network IDs and genesis states.
98-
97+
9998
*Note: Although there are some internal protective measures to prevent transactions from crossing
10099
over between the main network and test network, you should make sure to always use separate accounts
101100
for play-money and real-money. Unless you manually move accounts, Geth will by default correctly

build/deb/ethereum-swarm/deb.changelog

-5
This file was deleted.

build/deb/ethereum-swarm/deb.control

-19
This file was deleted.

build/deb/ethereum-swarm/deb.copyright

-14
This file was deleted.

build/deb/ethereum-swarm/deb.docs

-1
This file was deleted.

build/deb/ethereum-swarm/deb.install

-1
This file was deleted.

build/deb/ethereum-swarm/deb.rules

-16
This file was deleted.

build/deb/ethereum/deb.control

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ Vcs-Browser: https://github.com/ethereum/go-ethereum
1111
Package: {{.Name}}
1212
Architecture: any
1313
Depends: ${misc:Depends}, {{.ExeList}}
14-
Description: Meta-package to install geth, swarm, and other tools
15-
Meta-package to install geth, swarm and other tools
14+
Description: Meta-package to install geth and other tools
15+
Meta-package to install geth and other tools
1616

1717
{{range .Executables}}
1818
Package: {{$.ExeName .}}

build/update-license.go

-2
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,6 @@ var (
7272
"internal/jsre/deps",
7373
"log/",
7474
"common/bitutil/bitutil",
75-
// don't license generated files
76-
"contracts/chequebook/contract/code.go",
7775
}
7876

7977
// paths with this prefix are licensed as GPL. all other files are LGPL.

0 commit comments

Comments
 (0)