Sitelet https://github.com/jenikd/go-lachesis/commit/227606e02f8882fd3a5df84fbeff9c97c78320ad
Skip to content

Commit 227606e

Browse files
author
a.guzev
committed
ethereum rebranding
Merge pull request Fantom-foundation#381 from devintegral2/rebranding-for-eth-to-ftm
2 parents 3b6cdb1 + 261af2f commit 227606e

6 files changed

Lines changed: 16 additions & 12 deletions

File tree

‎cmd/lachesis/consolecmd_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func TestConsoleWelcome(t *testing.T) {
4040
// Verify the actual welcome message to the required template
4141
// TODO: clone (or PR) "github.com/ethereum/go-ethereum/console" to customize welcome message
4242
cli.Expect(`
43-
Welcome to the Geth JavaScript console!
43+
Welcome to the Lachesis JavaScript console!
4444
4545
instance: go-lachesis/v{{version}}/{{goos}}-{{goarch}}/{{gover}}
4646
coinbase: {{.Coinbase}}
@@ -119,7 +119,7 @@ func testAttachWelcome(t *testing.T, cli *testcli, endpoint, apis string) {
119119

120120
// Verify the actual welcome message to the required template
121121
attach.Expect(`
122-
Welcome to the Geth JavaScript console!
122+
Welcome to the Lachesis JavaScript console!
123123
124124
instance: go-lachesis/v{{version}}/{{goos}}-{{goarch}}/{{gover}}
125125
coinbase: {{coinbase}}

‎cmd/lachesis/fake_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ func TestFakeNetFlag(t *testing.T) {
3232
// Verify the actual welcome message to the required template
3333
// TODO: clone (or PR) "github.com/ethereum/go-ethereum/console" to customize welcome message
3434
cli.Expect(`
35-
Welcome to the Geth JavaScript console!
35+
Welcome to the Lachesis JavaScript console!
3636
3737
instance: go-lachesis/v{{version}}/{{goos}}-{{goarch}}/{{gover}}
3838
coinbase: {{.Coinbase}}

‎go.mod‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,3 +74,5 @@ require (
7474
gopkg.in/urfave/cli.v1 v1.20.0
7575
gopkg.in/yaml.v2 v2.2.2 // indirect
7676
)
77+
78+
replace github.com/ethereum/go-ethereum => github.com/Fantom-foundation/go-ethereum v1.9.1-ftm-0.1

‎go.sum‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1+
github.com/Fantom-foundation/go-ethereum v1.9.1-ftm-0.1 h1:85Tqgu9W1M95kbsiXN+nJSzWxKBY3MWwnfGT/qQ55xg=
2+
github.com/Fantom-foundation/go-ethereum v1.9.1-ftm-0.1/go.mod h1:6TpP1TyCqqml5Y/ZwvPnq0sU63lffYdqqLYnAxHfcis=
13
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
24
github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII=
3-
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc h1:cAKDfWh5VpdgMhJosfJnn5/FoN2SRZ4p7fJNX58YPaU=
45
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
5-
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf h1:qet1QNfXsQxTZqLG4oE62mJzwPIB8+Tee4RNCL9ulrY=
66
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
77
github.com/allegro/bigcache v1.2.1 h1:hg1sY1raCwic3Vnsvje6TT7/pnZba83LeFck5NrFKSc=
88
github.com/allegro/bigcache v1.2.1/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM=
@@ -44,8 +44,6 @@ github.com/elastic/gosigar v0.10.4 h1:6jfw75dsoflhBMRdO6QPzQUgLqUYTsQQQRkkcsHsuP
4444
github.com/elastic/gosigar v0.10.4/go.mod h1:cdorVVzy1fhmEqmtgqkoE3bYtCfSCkVyjTyCIo22xvs=
4545
github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg=
4646
github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o=
47-
github.com/ethereum/go-ethereum v1.9.1 h1:MrdTRvKIa3apdx6NW1azzSgl8BQB1eTBVSUmFhuztaU=
48-
github.com/ethereum/go-ethereum v1.9.1/go.mod h1:PwpWDrCLZrV+tfrhqqF6kPknbISMHaJv9Ln3kPCZLwY=
4947
github.com/evalphobia/logrus_sentry v0.8.2 h1:dotxHq+YLZsT1Bb45bB5UQbfCh3gM/nFFetyN46VoDQ=
5048
github.com/evalphobia/logrus_sentry v0.8.2/go.mod h1:pKcp+vriitUqu9KiWj/VRFbRfFNUwz95/UkgG8a6MNc=
5149
github.com/facebookgo/atomicfile v0.0.0-20151019160806-2de1f203e7d5 h1:BBso6MBKW8ncyZLv37o+KNyy0HrrHgfnOaGQC2qvN+A=
@@ -72,7 +70,6 @@ github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7a
7270
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
7371
github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg=
7472
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
75-
github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db h1:woRePGFeVFfLKN/pOkfl+p/TAqKOfFu+7KPlMVpok/w=
7673
github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
7774
github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
7875
github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
@@ -237,7 +234,6 @@ golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3
237234
golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c h1:IGkKhmfzcztjm6gYkykvu/NiS8kaqbCWAEWWAyf8J5U=
238235
golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
239236
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
240-
gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc=
241237
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
242238
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
243239
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=

‎poset/common_test.go‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,12 @@ func FakePoset(namespace string, nodes []common.Address, mods ...memorydb.Mod) (
6666

6767
input := NewEventStore(nil)
6868

69-
poset := New(lachesis.FakeNetDagConfig(), store, input)
69+
config := lachesis.FakeNetDagConfig()
70+
if config.EpochLen > 100 {
71+
// EpochLen too big, test timeout is possible.
72+
config.EpochLen = 100
73+
}
74+
poset := New(config, store, input)
7075

7176
extended := &ExtendedPoset{
7277
Poset: poset,

‎poset/frame_decide_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package poset
22

33
import (
44
"bytes"
5-
"github.com/Fantom-foundation/go-lachesis/logger"
65
"sort"
76
"testing"
87

@@ -13,6 +12,7 @@ import (
1312
"github.com/Fantom-foundation/go-lachesis/inter"
1413
"github.com/Fantom-foundation/go-lachesis/inter/idx"
1514
"github.com/Fantom-foundation/go-lachesis/inter/pos"
15+
"github.com/Fantom-foundation/go-lachesis/logger"
1616
)
1717

1818
func TestConfirmBlockEvents(t *testing.T) {
@@ -34,7 +34,8 @@ func TestConfirmBlockEvents(t *testing.T) {
3434
return applyBlock(block, stateHash, validators)
3535
}
3636

37-
_ = inter.ForEachRandEvent(nodes, int(poset.dag.EpochLen), poset.dag.MaxParents, nil, inter.ForEachEvent{
37+
eventCount := int(poset.dag.EpochLen)
38+
_ = inter.ForEachRandEvent(nodes, eventCount, poset.dag.MaxParents, nil, inter.ForEachEvent{
3839
Process: func(e *inter.Event, name string) {
3940
input.SetEvent(e)
4041
assertar.NoError(

0 commit comments

Comments
 (0)