From 10b44a254c9cc6dc6d7a8b1d22255f2698f74ca8 Mon Sep 17 00:00:00 2001 From: Richard Ramos Date: Fri, 18 Feb 2022 17:19:42 -0400 Subject: [PATCH] feat: adding status.test fleet --- VERSION | 2 +- cmd/statusd/main.go | 2 +- config/cli/fleet-status.test.json | 25 +++ params/cluster.go | 1 + static/bindata.go | 256 +++++++++++++----------------- 5 files changed, 141 insertions(+), 145 deletions(-) create mode 100644 config/cli/fleet-status.test.json diff --git a/VERSION b/VERSION index 0a4eab771..47fccbc6f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.94.4 +0.94.5 diff --git a/cmd/statusd/main.go b/cmd/statusd/main.go index 5295f6323..6b3ac548b 100644 --- a/cmd/statusd/main.go +++ b/cmd/statusd/main.go @@ -63,7 +63,7 @@ var ( params.FleetProd, fmt.Sprintf( "Select fleet: %s (default %s)", - []string{params.FleetProd, params.FleetStaging, params.FleetTest, params.FleetWakuV2Prod, params.FleetWakuV2Test}, params.FleetProd, + []string{params.FleetProd, params.FleetStaging, params.FleetTest, params.FleetWakuV2Prod, params.FleetWakuV2Test, params.FleetStatusTest}, params.FleetProd, ), ) listenAddr = flag.String("addr", "", "address to bind listener to") diff --git a/config/cli/fleet-status.test.json b/config/cli/fleet-status.test.json new file mode 100644 index 000000000..581ee982c --- /dev/null +++ b/config/cli/fleet-status.test.json @@ -0,0 +1,25 @@ +{ + "Rendezvous": false, + "NoDiscovery": true, + "ClusterConfig": { + "Enabled": true, + "Fleet": "status.test", + "BootNodes": [], + "TrustedMailServers": [], + "PushNotificationsServers": [], + "StaticNodes": [], + "RendezvousNodes": [], + "WakuNodes": [ + "/ip4/47.242.233.36/tcp/30303/p2p/16Uiu2HAm2BjXxCp1sYFJQKpLLbPbwd5juxbsYofu3TsS3auvT9Yi", + "/ip4/64.225.81.237/tcp/30303/p2p/16Uiu2HAkukebeXjTQ9QDBeNDWuGfbaSg79wkkhK4vPocLgR6QFDf", + "/ip4/34.122.252.118/tcp/30303/p2p/16Uiu2HAmGDX3iAFox93PupVYaHa88kULGqMpJ7AEHGwj3jbMtt76" + ], + "WakuStoreNodes": [ + "/ip4/47.242.233.36/tcp/30303/p2p/16Uiu2HAm2BjXxCp1sYFJQKpLLbPbwd5juxbsYofu3TsS3auvT9Yi", + "/ip4/64.225.81.237/tcp/30303/p2p/16Uiu2HAkukebeXjTQ9QDBeNDWuGfbaSg79wkkhK4vPocLgR6QFDf", + "/ip4/34.122.252.118/tcp/30303/p2p/16Uiu2HAmGDX3iAFox93PupVYaHa88kULGqMpJ7AEHGwj3jbMtt76" ] + }, + "WakuV2Config": { + "Enabled": true + } +} diff --git a/params/cluster.go b/params/cluster.go index 28fbbc242..ba6efe793 100644 --- a/params/cluster.go +++ b/params/cluster.go @@ -8,6 +8,7 @@ const ( FleetTest = "eth.test" FleetWakuV2Prod = "wakuv2.prod" FleetWakuV2Test = "wakuv2.test" + FleetStatusTest = "status.test" ) // Cluster defines a list of Ethereum nodes. diff --git a/static/bindata.go b/static/bindata.go index b4a540e4f..e68311b9b 100644 --- a/static/bindata.go +++ b/static/bindata.go @@ -1,30 +1,31 @@ -// Code generated by go-bindata. DO NOT EDIT. +// Code generated by go-bindata. // sources: -// ../config/README.md (3.031kB) -// ../config/cli/anon-metric-node-client.json (857B) -// ../config/cli/anon-metric-node-server.json (696B) -// ../config/cli/fleet-eth.prod.json (4.47kB) -// ../config/cli/fleet-eth.staging.json (2.145kB) -// ../config/cli/fleet-eth.test.json (2.174kB) -// ../config/cli/fleet-wakuv2.prod.json (747B) -// ../config/cli/fleet-wakuv2.test.json (748B) -// ../config/cli/les-enabled.json (58B) -// ../config/cli/mailserver-enabled.json (176B) -// ../config/status-chain-genesis.json (612B) -// keys/bootnode.key (65B) -// keys/firebaseauthkey (153B) -// keys/test-account1-status-chain.pk (489B) -// keys/test-account1.pk (491B) -// keys/test-account2-status-chain.pk (489B) -// keys/test-account2.pk (491B) -// keys/test-account3-before-eip55.pk (489B) +// ../config/README.md +// ../config/cli/anon-metric-node-client.json +// ../config/cli/anon-metric-node-server.json +// ../config/cli/fleet-eth.prod.json +// ../config/cli/fleet-eth.staging.json +// ../config/cli/fleet-eth.test.json +// ../config/cli/fleet-status.test.json +// ../config/cli/fleet-wakuv2.prod.json +// ../config/cli/fleet-wakuv2.test.json +// ../config/cli/les-enabled.json +// ../config/cli/mailserver-enabled.json +// ../config/status-chain-genesis.json +// keys/bootnode.key +// keys/firebaseauthkey +// keys/test-account1-status-chain.pk +// keys/test-account1.pk +// keys/test-account2-status-chain.pk +// keys/test-account2.pk +// keys/test-account3-before-eip55.pk +// DO NOT EDIT! package static import ( "bytes" "compress/gzip" - "crypto/sha256" "fmt" "io" "io/ioutil" @@ -37,7 +38,7 @@ import ( func bindataRead(data []byte, name string) ([]byte, error) { gz, err := gzip.NewReader(bytes.NewBuffer(data)) if err != nil { - return nil, fmt.Errorf("read %q: %v", name, err) + return nil, fmt.Errorf("Read %q: %v", name, err) } var buf bytes.Buffer @@ -45,7 +46,7 @@ func bindataRead(data []byte, name string) ([]byte, error) { clErr := gz.Close() if err != nil { - return nil, fmt.Errorf("read %q: %v", name, err) + return nil, fmt.Errorf("Read %q: %v", name, err) } if clErr != nil { return nil, err @@ -55,9 +56,8 @@ func bindataRead(data []byte, name string) ([]byte, error) { } type asset struct { - bytes []byte - info os.FileInfo - digest [sha256.Size]byte + bytes []byte + info os.FileInfo } type bindataFileInfo struct { @@ -101,8 +101,8 @@ func ConfigReadmeMd() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "../config/README.md", size: 3031, mode: os.FileMode(0644), modTime: time.Unix(1643299628, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x15, 0x44, 0x2b, 0x13, 0x14, 0x34, 0xa, 0x66, 0x62, 0x1b, 0xc6, 0x4a, 0x2c, 0x7d, 0x4d, 0x89, 0xfb, 0xc9, 0x69, 0xe4, 0x18, 0x5f, 0x3, 0x98, 0x6d, 0x3c, 0x9e, 0xa8, 0xcd, 0x53, 0x5d, 0x75}} + info := bindataFileInfo{name: "../config/README.md", size: 3031, mode: os.FileMode(436), modTime: time.Unix(1643209233, 0)} + a := &asset{bytes: bytes, info: info} return a, nil } @@ -121,8 +121,8 @@ func ConfigCliAnonMetricNodeClientJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "../config/cli/anon-metric-node-client.json", size: 857, mode: os.FileMode(0644), modTime: time.Unix(1630498597, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x90, 0xdf, 0xcd, 0xc8, 0x92, 0x1d, 0x63, 0x5e, 0xe1, 0xf9, 0x7f, 0xed, 0xf2, 0x68, 0x6b, 0x20, 0xff, 0x1d, 0x3b, 0xc9, 0x7b, 0xb9, 0x6a, 0xba, 0xd3, 0xbd, 0xf7, 0x48, 0x7b, 0x5a, 0x52, 0x79}} + info := bindataFileInfo{name: "../config/cli/anon-metric-node-client.json", size: 857, mode: os.FileMode(436), modTime: time.Unix(1643209233, 0)} + a := &asset{bytes: bytes, info: info} return a, nil } @@ -141,8 +141,8 @@ func ConfigCliAnonMetricNodeServerJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "../config/cli/anon-metric-node-server.json", size: 696, mode: os.FileMode(0644), modTime: time.Unix(1630498597, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0xf0, 0x2f, 0x97, 0xab, 0x77, 0x61, 0x93, 0x9d, 0x1f, 0x33, 0x18, 0x72, 0xad, 0xce, 0xa3, 0x35, 0xa9, 0x44, 0xbf, 0x29, 0xa8, 0xea, 0x21, 0xb7, 0x22, 0x7f, 0x7d, 0x3a, 0x6b, 0x55, 0x3c, 0x66}} + info := bindataFileInfo{name: "../config/cli/anon-metric-node-server.json", size: 696, mode: os.FileMode(436), modTime: time.Unix(1643209233, 0)} + a := &asset{bytes: bytes, info: info} return a, nil } @@ -161,8 +161,8 @@ func ConfigCliFleetEthProdJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "../config/cli/fleet-eth.prod.json", size: 4470, mode: os.FileMode(0644), modTime: time.Unix(1630498597, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x34, 0x7b, 0x71, 0xe3, 0x8a, 0xb0, 0x7f, 0xc3, 0xe, 0xd2, 0x67, 0x38, 0x50, 0xf4, 0x27, 0xaa, 0xec, 0x47, 0xa1, 0x1, 0xf7, 0x5d, 0xe9, 0x8f, 0x3c, 0x35, 0x9f, 0xdb, 0x9b, 0x30, 0x88, 0x26}} + info := bindataFileInfo{name: "../config/cli/fleet-eth.prod.json", size: 4470, mode: os.FileMode(436), modTime: time.Unix(1643209233, 0)} + a := &asset{bytes: bytes, info: info} return a, nil } @@ -181,8 +181,8 @@ func ConfigCliFleetEthStagingJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "../config/cli/fleet-eth.staging.json", size: 2145, mode: os.FileMode(0644), modTime: time.Unix(1630498597, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0xa2, 0xe9, 0x85, 0x4b, 0x66, 0xa4, 0x1d, 0x4e, 0xaf, 0x21, 0xd7, 0xc2, 0x59, 0xf7, 0xd, 0xc2, 0x61, 0x4e, 0x4a, 0x9e, 0x38, 0x90, 0x6a, 0x2a, 0x16, 0xa6, 0x5c, 0x6d, 0x0, 0x5, 0x6, 0xb3}} + info := bindataFileInfo{name: "../config/cli/fleet-eth.staging.json", size: 2145, mode: os.FileMode(436), modTime: time.Unix(1643209233, 0)} + a := &asset{bytes: bytes, info: info} return a, nil } @@ -201,8 +201,28 @@ func ConfigCliFleetEthTestJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "../config/cli/fleet-eth.test.json", size: 2174, mode: os.FileMode(0644), modTime: time.Unix(1630498597, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x55, 0x19, 0xca, 0x8d, 0xaa, 0x69, 0x9b, 0xa2, 0xa1, 0xdd, 0xef, 0xf2, 0x63, 0x5e, 0xcd, 0xe2, 0x8f, 0xc7, 0x37, 0x7e, 0x41, 0xa1, 0xc1, 0x3f, 0x65, 0x80, 0xa, 0xa4, 0x27, 0x74, 0x8d, 0xc6}} + info := bindataFileInfo{name: "../config/cli/fleet-eth.test.json", size: 2174, mode: os.FileMode(436), modTime: time.Unix(1643209233, 0)} + a := &asset{bytes: bytes, info: info} + return a, nil +} + +var _ConfigCliFleetStatusTestJson = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x93\xd1\x6e\xda\x30\x18\x85\xef\x79\x0a\xcb\xd7\x93\xd3\xd8\x21\x01\xee\x80\x14\x50\x0b\x08\x1a\xda\x82\xa6\x5d\x38\x89\x43\x9d\x64\xd8\x8b\x7f\x07\xb6\xa9\xef\x3e\x25\x63\x5b\xb7\x8e\x69\x0f\xd0\xdb\x73\x8e\xbe\x5f\xe7\x48\xff\xd7\x0e\x42\xf8\x4e\x1c\x52\xf1\xa5\x56\xd6\xe0\x01\xca\x78\x69\xc4\xbb\x46\x5e\xaa\x50\x9a\x44\xd5\xa2\xfa\x8c\x07\x08\x2a\xfb\x5d\x1e\x97\xd6\x80\xa8\xc6\xea\x90\xc9\x3d\x1e\xa0\x06\x81\x10\xbe\x3e\xf0\xb8\x14\xe9\x8b\x24\x42\x78\x52\x0a\x01\x78\x80\xb0\x01\x0e\xd6\x10\x10\x06\xf0\xd9\x1b\x29\x05\x4b\x95\x8a\xe6\xe8\xfb\x0f\x67\x71\x53\x35\xf0\x74\xc1\x65\x19\x89\xaa\x16\xd5\x6f\xee\xca\x9a\xa7\xa5\x02\x99\xc9\x84\x83\x54\x07\xf3\x97\x4c\x04\x1c\x64\xf2\x0a\xfc\xab\xe3\x2b\xeb\x91\x17\xf6\xa7\xd8\x4a\x08\x61\x47\x6a\xcf\xf1\x02\x42\x3d\x4a\x28\x63\x84\xf9\x0e\x24\xda\x61\x57\xec\x8a\x39\x9a\x6a\xc7\xf5\xef\xa5\xa5\xb3\xe1\x47\x3a\xca\xb7\xa7\xb1\x76\xcd\x6e\x72\xb3\xbe\xd5\xf3\x79\xbc\x8a\x8f\x69\x37\xb7\xa7\xd8\xec\x54\x66\xd9\xc6\x44\x8c\xdb\x7a\xd3\xdf\xc9\x73\xf7\x1f\x7c\xdf\x23\x94\x76\x49\xcf\x25\x94\x05\x17\xf8\x85\x2d\x44\x2c\xb6\xf9\x66\xdd\x5f\x87\x23\xb1\x0c\x1f\xed\x34\x8b\x79\xb4\x0f\xfa\xc7\xa2\x78\xba\xf5\xea\x95\x4a\xe6\xfb\x3b\x7f\x3d\x09\xb3\x3f\xf8\xcc\x23\x2e\xa5\x84\x76\x29\x71\xdd\xde\xa5\x02\xd3\x70\xcb\xe4\x70\xa2\x4e\x7d\xb6\xb2\xfa\x61\xc7\x67\xbc\xd7\x2b\xee\xe7\xd3\x4f\x0b\x7d\x13\x0c\xaf\x67\xd3\x63\xce\xf2\x78\x01\x10\xf8\xb8\xe5\xbf\x5c\x2e\x02\x55\x89\xb7\xf9\xfe\x73\xbe\x76\xbd\x0e\x42\xcf\xed\x2b\x35\xfb\x3d\xd0\x7f\x7f\x52\x13\xee\x3c\x77\xbe\x05\x00\x00\xff\xff\x7d\x14\xb1\x90\xa9\x03\x00\x00") + +func ConfigCliFleetStatusTestJsonBytes() ([]byte, error) { + return bindataRead( + _ConfigCliFleetStatusTestJson, + "../config/cli/fleet-status.test.json", + ) +} + +func ConfigCliFleetStatusTestJson() (*asset, error) { + bytes, err := ConfigCliFleetStatusTestJsonBytes() + if err != nil { + return nil, err + } + + info := bindataFileInfo{name: "../config/cli/fleet-status.test.json", size: 937, mode: os.FileMode(436), modTime: time.Unix(1645218442, 0)} + a := &asset{bytes: bytes, info: info} return a, nil } @@ -221,8 +241,8 @@ func ConfigCliFleetWakuv2ProdJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "../config/cli/fleet-wakuv2.prod.json", size: 747, mode: os.FileMode(0644), modTime: time.Unix(1629202661, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0xc3, 0x81, 0x84, 0xfd, 0x7d, 0x7e, 0x27, 0xc8, 0x5e, 0xb6, 0x38, 0xe1, 0x6, 0xa, 0xbc, 0x86, 0x87, 0x54, 0xa2, 0x2f, 0xe1, 0xa1, 0xc8, 0x6, 0x80, 0xfa, 0xed, 0xfe, 0x13, 0x6c, 0x81, 0xd9}} + info := bindataFileInfo{name: "../config/cli/fleet-wakuv2.prod.json", size: 747, mode: os.FileMode(436), modTime: time.Unix(1643209233, 0)} + a := &asset{bytes: bytes, info: info} return a, nil } @@ -241,8 +261,8 @@ func ConfigCliFleetWakuv2TestJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "../config/cli/fleet-wakuv2.test.json", size: 748, mode: os.FileMode(0644), modTime: time.Unix(1629202661, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x77, 0x6d, 0x28, 0xb7, 0xc2, 0xf3, 0x22, 0xe3, 0x6d, 0xc1, 0xeb, 0x4b, 0x42, 0xe2, 0x6, 0xb0, 0x60, 0x30, 0xdb, 0xe3, 0x26, 0xff, 0x9, 0xf5, 0xea, 0xe6, 0x56, 0xce, 0xa8, 0x98, 0x61, 0x70}} + info := bindataFileInfo{name: "../config/cli/fleet-wakuv2.test.json", size: 748, mode: os.FileMode(436), modTime: time.Unix(1643209233, 0)} + a := &asset{bytes: bytes, info: info} return a, nil } @@ -261,8 +281,8 @@ func ConfigCliLesEnabledJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "../config/cli/les-enabled.json", size: 58, mode: os.FileMode(0644), modTime: time.Unix(1585751575, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x7e, 0xee, 0x27, 0xa7, 0x74, 0xa0, 0x46, 0xa1, 0x41, 0xed, 0x4d, 0x16, 0x5b, 0xf3, 0xf0, 0x7c, 0xc8, 0x2f, 0x6f, 0x47, 0xa4, 0xbb, 0x5f, 0x43, 0x33, 0xd, 0x9, 0x9d, 0xea, 0x9e, 0x15, 0xee}} + info := bindataFileInfo{name: "../config/cli/les-enabled.json", size: 58, mode: os.FileMode(436), modTime: time.Unix(1643209233, 0)} + a := &asset{bytes: bytes, info: info} return a, nil } @@ -281,8 +301,8 @@ func ConfigCliMailserverEnabledJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "../config/cli/mailserver-enabled.json", size: 176, mode: os.FileMode(0644), modTime: time.Unix(1585751575, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x34, 0xec, 0x81, 0x8b, 0x99, 0xb6, 0xdb, 0xc0, 0x8b, 0x46, 0x97, 0x96, 0xc7, 0x58, 0x30, 0x33, 0xef, 0x54, 0x25, 0x87, 0x7b, 0xb9, 0x94, 0x6b, 0x18, 0xa4, 0x5b, 0x58, 0x67, 0x7c, 0x44, 0xa6}} + info := bindataFileInfo{name: "../config/cli/mailserver-enabled.json", size: 176, mode: os.FileMode(436), modTime: time.Unix(1643209233, 0)} + a := &asset{bytes: bytes, info: info} return a, nil } @@ -301,8 +321,8 @@ func ConfigStatusChainGenesisJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "../config/status-chain-genesis.json", size: 612, mode: os.FileMode(0644), modTime: time.Unix(1585751575, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0xb, 0xf0, 0xc, 0x1, 0x95, 0x65, 0x6, 0x55, 0x48, 0x8f, 0x83, 0xa0, 0xb4, 0x81, 0xda, 0xad, 0x30, 0x6d, 0xb2, 0x78, 0x1b, 0x26, 0x4, 0x13, 0x12, 0x9, 0x6, 0xae, 0x3a, 0x2c, 0x1, 0x71}} + info := bindataFileInfo{name: "../config/status-chain-genesis.json", size: 612, mode: os.FileMode(436), modTime: time.Unix(1643209233, 0)} + a := &asset{bytes: bytes, info: info} return a, nil } @@ -321,8 +341,8 @@ func keysBootnodeKey() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "keys/bootnode.key", size: 65, mode: os.FileMode(0644), modTime: time.Unix(1585751575, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x31, 0xcf, 0x27, 0xd4, 0x96, 0x2e, 0x32, 0xcd, 0x58, 0x96, 0x2a, 0xe5, 0x8c, 0xa0, 0xf1, 0x73, 0x1f, 0xd6, 0xd6, 0x8b, 0xb, 0x73, 0xd3, 0x2c, 0x84, 0x1a, 0x56, 0xa4, 0x74, 0xb6, 0x95, 0x20}} + info := bindataFileInfo{name: "keys/bootnode.key", size: 65, mode: os.FileMode(436), modTime: time.Unix(1643209233, 0)} + a := &asset{bytes: bytes, info: info} return a, nil } @@ -341,8 +361,8 @@ func keysFirebaseauthkey() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "keys/firebaseauthkey", size: 153, mode: os.FileMode(0644), modTime: time.Unix(1585751575, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0xe, 0x69, 0x23, 0x64, 0x7d, 0xf9, 0x14, 0x37, 0x6f, 0x2b, 0x1, 0xf0, 0xb0, 0xa4, 0xb2, 0xd0, 0x18, 0xcd, 0xf9, 0xeb, 0x57, 0xa3, 0xfd, 0x79, 0x25, 0xa7, 0x9c, 0x3, 0xce, 0x26, 0xec, 0xe1}} + info := bindataFileInfo{name: "keys/firebaseauthkey", size: 153, mode: os.FileMode(436), modTime: time.Unix(1643209233, 0)} + a := &asset{bytes: bytes, info: info} return a, nil } @@ -361,8 +381,8 @@ func keysTestAccount1StatusChainPk() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "keys/test-account1-status-chain.pk", size: 489, mode: os.FileMode(0644), modTime: time.Unix(1585751575, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x8f, 0xba, 0x35, 0x1, 0x2b, 0x9d, 0xad, 0xf0, 0x2d, 0x3c, 0x4d, 0x6, 0xb5, 0x22, 0x2, 0x47, 0xd4, 0x1c, 0xf4, 0x31, 0x2f, 0xb, 0x5b, 0x27, 0x5d, 0x43, 0x97, 0x58, 0x2d, 0xf0, 0xe1, 0xbe}} + info := bindataFileInfo{name: "keys/test-account1-status-chain.pk", size: 489, mode: os.FileMode(436), modTime: time.Unix(1643209233, 0)} + a := &asset{bytes: bytes, info: info} return a, nil } @@ -381,8 +401,8 @@ func keysTestAccount1Pk() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "keys/test-account1.pk", size: 491, mode: os.FileMode(0644), modTime: time.Unix(1585751575, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x9, 0x43, 0xc2, 0xf4, 0x8c, 0xc6, 0x64, 0x25, 0x8c, 0x7, 0x8c, 0xa8, 0x89, 0x2b, 0x7b, 0x9b, 0x4f, 0x81, 0xcb, 0xce, 0x3d, 0xef, 0x82, 0x9c, 0x27, 0x27, 0xa9, 0xc5, 0x46, 0x70, 0x30, 0x38}} + info := bindataFileInfo{name: "keys/test-account1.pk", size: 491, mode: os.FileMode(436), modTime: time.Unix(1643209233, 0)} + a := &asset{bytes: bytes, info: info} return a, nil } @@ -401,8 +421,8 @@ func keysTestAccount2StatusChainPk() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "keys/test-account2-status-chain.pk", size: 489, mode: os.FileMode(0644), modTime: time.Unix(1585751575, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x9, 0xf8, 0x5c, 0xe9, 0x92, 0x96, 0x2d, 0x88, 0x2b, 0x8e, 0x42, 0x3f, 0xa4, 0x93, 0x6c, 0xad, 0xe9, 0xc0, 0x1b, 0x8a, 0x8, 0x8c, 0x5e, 0x7a, 0x84, 0xa2, 0xf, 0x9f, 0x77, 0x58, 0x2c, 0x2c}} + info := bindataFileInfo{name: "keys/test-account2-status-chain.pk", size: 489, mode: os.FileMode(436), modTime: time.Unix(1643209233, 0)} + a := &asset{bytes: bytes, info: info} return a, nil } @@ -421,8 +441,8 @@ func keysTestAccount2Pk() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "keys/test-account2.pk", size: 491, mode: os.FileMode(0644), modTime: time.Unix(1585751575, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x9f, 0x72, 0xd5, 0x95, 0x5c, 0x5a, 0x99, 0x9d, 0x2f, 0x21, 0x83, 0xd7, 0x10, 0x17, 0x4a, 0x3d, 0x65, 0xc9, 0x26, 0x1a, 0x2c, 0x9d, 0x65, 0x63, 0xd2, 0xa0, 0xfc, 0x7c, 0x0, 0x87, 0x38, 0x9f}} + info := bindataFileInfo{name: "keys/test-account2.pk", size: 491, mode: os.FileMode(436), modTime: time.Unix(1643209233, 0)} + a := &asset{bytes: bytes, info: info} return a, nil } @@ -441,8 +461,8 @@ func keysTestAccount3BeforeEip55Pk() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "keys/test-account3-before-eip55.pk", size: 489, mode: os.FileMode(0644), modTime: time.Unix(1585751575, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x81, 0x40, 0x56, 0xc1, 0x5e, 0x10, 0x6e, 0x28, 0x15, 0x3, 0x4e, 0xc4, 0xc4, 0x71, 0x4d, 0x16, 0x99, 0xcc, 0x1b, 0x63, 0xee, 0x10, 0x20, 0xe4, 0x59, 0x52, 0x3f, 0xc0, 0xad, 0x15, 0x13, 0x72}} + info := bindataFileInfo{name: "keys/test-account3-before-eip55.pk", size: 489, mode: os.FileMode(436), modTime: time.Unix(1643209233, 0)} + a := &asset{bytes: bytes, info: info} return a, nil } @@ -450,8 +470,8 @@ func keysTestAccount3BeforeEip55Pk() (*asset, error) { // It returns an error if the asset could not be found or // could not be loaded. func Asset(name string) ([]byte, error) { - canonicalName := strings.Replace(name, "\\", "/", -1) - if f, ok := _bindata[canonicalName]; ok { + cannonicalName := strings.Replace(name, "\\", "/", -1) + if f, ok := _bindata[cannonicalName]; ok { a, err := f() if err != nil { return nil, fmt.Errorf("Asset %s can't read by error: %v", name, err) @@ -461,12 +481,6 @@ func Asset(name string) ([]byte, error) { return nil, fmt.Errorf("Asset %s not found", name) } -// AssetString returns the asset contents as a string (instead of a []byte). -func AssetString(name string) (string, error) { - data, err := Asset(name) - return string(data), err -} - // MustAsset is like Asset but panics when Asset would return an error. // It simplifies safe initialization of global variables. func MustAsset(name string) []byte { @@ -478,18 +492,12 @@ func MustAsset(name string) []byte { return a } -// MustAssetString is like AssetString but panics when Asset would return an -// error. It simplifies safe initialization of global variables. -func MustAssetString(name string) string { - return string(MustAsset(name)) -} - // AssetInfo loads and returns the asset info for the given name. // It returns an error if the asset could not be found or // could not be loaded. func AssetInfo(name string) (os.FileInfo, error) { - canonicalName := strings.Replace(name, "\\", "/", -1) - if f, ok := _bindata[canonicalName]; ok { + cannonicalName := strings.Replace(name, "\\", "/", -1) + if f, ok := _bindata[cannonicalName]; ok { a, err := f() if err != nil { return nil, fmt.Errorf("AssetInfo %s can't read by error: %v", name, err) @@ -499,33 +507,6 @@ func AssetInfo(name string) (os.FileInfo, error) { return nil, fmt.Errorf("AssetInfo %s not found", name) } -// AssetDigest returns the digest of the file with the given name. It returns an -// error if the asset could not be found or the digest could not be loaded. -func AssetDigest(name string) ([sha256.Size]byte, error) { - canonicalName := strings.Replace(name, "\\", "/", -1) - if f, ok := _bindata[canonicalName]; ok { - a, err := f() - if err != nil { - return [sha256.Size]byte{}, fmt.Errorf("AssetDigest %s can't read by error: %v", name, err) - } - return a.digest, nil - } - return [sha256.Size]byte{}, fmt.Errorf("AssetDigest %s not found", name) -} - -// Digests returns a map of all known files and their checksums. -func Digests() (map[string][sha256.Size]byte, error) { - mp := make(map[string][sha256.Size]byte, len(_bindata)) - for name := range _bindata { - a, err := _bindata[name]() - if err != nil { - return nil, err - } - mp[name] = a.digest - } - return mp, nil -} - // AssetNames returns the names of the assets. func AssetNames() []string { names := make([]string, 0, len(_bindata)) @@ -538,39 +519,23 @@ func AssetNames() []string { // _bindata is a table, holding each asset generator, mapped to its name. var _bindata = map[string]func() (*asset, error){ "../config/README.md": ConfigReadmeMd, - "../config/cli/anon-metric-node-client.json": ConfigCliAnonMetricNodeClientJson, - "../config/cli/anon-metric-node-server.json": ConfigCliAnonMetricNodeServerJson, - "../config/cli/fleet-eth.prod.json": ConfigCliFleetEthProdJson, - "../config/cli/fleet-eth.staging.json": ConfigCliFleetEthStagingJson, - "../config/cli/fleet-eth.test.json": ConfigCliFleetEthTestJson, - + "../config/cli/fleet-status.test.json": ConfigCliFleetStatusTestJson, "../config/cli/fleet-wakuv2.prod.json": ConfigCliFleetWakuv2ProdJson, - "../config/cli/fleet-wakuv2.test.json": ConfigCliFleetWakuv2TestJson, - "../config/cli/les-enabled.json": ConfigCliLesEnabledJson, - "../config/cli/mailserver-enabled.json": ConfigCliMailserverEnabledJson, - "../config/status-chain-genesis.json": ConfigStatusChainGenesisJson, - "keys/bootnode.key": keysBootnodeKey, - "keys/firebaseauthkey": keysFirebaseauthkey, - "keys/test-account1-status-chain.pk": keysTestAccount1StatusChainPk, - "keys/test-account1.pk": keysTestAccount1Pk, - "keys/test-account2-status-chain.pk": keysTestAccount2StatusChainPk, - "keys/test-account2.pk": keysTestAccount2Pk, - "keys/test-account3-before-eip55.pk": keysTestAccount3BeforeEip55Pk, } @@ -583,15 +548,15 @@ var _bindata = map[string]func() (*asset, error){ // img/ // a.png // b.png -// then AssetDir("data") would return []string{"foo.txt", "img"}, -// AssetDir("data/img") would return []string{"a.png", "b.png"}, -// AssetDir("foo.txt") and AssetDir("notexist") would return an error, and +// then AssetDir("data") would return []string{"foo.txt", "img"} +// AssetDir("data/img") would return []string{"a.png", "b.png"} +// AssetDir("foo.txt") and AssetDir("notexist") would return an error // AssetDir("") will return []string{"data"}. func AssetDir(name string) ([]string, error) { node := _bintree if len(name) != 0 { - canonicalName := strings.Replace(name, "\\", "/", -1) - pathList := strings.Split(canonicalName, "/") + cannonicalName := strings.Replace(name, "\\", "/", -1) + pathList := strings.Split(cannonicalName, "/") for _, p := range pathList { node = node.Children[p] if node == nil { @@ -613,7 +578,6 @@ type bintree struct { Func func() (*asset, error) Children map[string]*bintree } - var _bintree = &bintree{nil, map[string]*bintree{ "..": &bintree{nil, map[string]*bintree{ "config": &bintree{nil, map[string]*bintree{ @@ -621,29 +585,30 @@ var _bintree = &bintree{nil, map[string]*bintree{ "cli": &bintree{nil, map[string]*bintree{ "anon-metric-node-client.json": &bintree{ConfigCliAnonMetricNodeClientJson, map[string]*bintree{}}, "anon-metric-node-server.json": &bintree{ConfigCliAnonMetricNodeServerJson, map[string]*bintree{}}, - "fleet-eth.prod.json": &bintree{ConfigCliFleetEthProdJson, map[string]*bintree{}}, - "fleet-eth.staging.json": &bintree{ConfigCliFleetEthStagingJson, map[string]*bintree{}}, - "fleet-eth.test.json": &bintree{ConfigCliFleetEthTestJson, map[string]*bintree{}}, - "fleet-wakuv2.prod.json": &bintree{ConfigCliFleetWakuv2ProdJson, map[string]*bintree{}}, - "fleet-wakuv2.test.json": &bintree{ConfigCliFleetWakuv2TestJson, map[string]*bintree{}}, - "les-enabled.json": &bintree{ConfigCliLesEnabledJson, map[string]*bintree{}}, - "mailserver-enabled.json": &bintree{ConfigCliMailserverEnabledJson, map[string]*bintree{}}, + "fleet-eth.prod.json": &bintree{ConfigCliFleetEthProdJson, map[string]*bintree{}}, + "fleet-eth.staging.json": &bintree{ConfigCliFleetEthStagingJson, map[string]*bintree{}}, + "fleet-eth.test.json": &bintree{ConfigCliFleetEthTestJson, map[string]*bintree{}}, + "fleet-status.test.json": &bintree{ConfigCliFleetStatusTestJson, map[string]*bintree{}}, + "fleet-wakuv2.prod.json": &bintree{ConfigCliFleetWakuv2ProdJson, map[string]*bintree{}}, + "fleet-wakuv2.test.json": &bintree{ConfigCliFleetWakuv2TestJson, map[string]*bintree{}}, + "les-enabled.json": &bintree{ConfigCliLesEnabledJson, map[string]*bintree{}}, + "mailserver-enabled.json": &bintree{ConfigCliMailserverEnabledJson, map[string]*bintree{}}, }}, "status-chain-genesis.json": &bintree{ConfigStatusChainGenesisJson, map[string]*bintree{}}, }}, }}, "keys": &bintree{nil, map[string]*bintree{ - "bootnode.key": &bintree{keysBootnodeKey, map[string]*bintree{}}, - "firebaseauthkey": &bintree{keysFirebaseauthkey, map[string]*bintree{}}, + "bootnode.key": &bintree{keysBootnodeKey, map[string]*bintree{}}, + "firebaseauthkey": &bintree{keysFirebaseauthkey, map[string]*bintree{}}, "test-account1-status-chain.pk": &bintree{keysTestAccount1StatusChainPk, map[string]*bintree{}}, - "test-account1.pk": &bintree{keysTestAccount1Pk, map[string]*bintree{}}, + "test-account1.pk": &bintree{keysTestAccount1Pk, map[string]*bintree{}}, "test-account2-status-chain.pk": &bintree{keysTestAccount2StatusChainPk, map[string]*bintree{}}, - "test-account2.pk": &bintree{keysTestAccount2Pk, map[string]*bintree{}}, + "test-account2.pk": &bintree{keysTestAccount2Pk, map[string]*bintree{}}, "test-account3-before-eip55.pk": &bintree{keysTestAccount3BeforeEip55Pk, map[string]*bintree{}}, }}, }} -// RestoreAsset restores an asset under the given directory. +// RestoreAsset restores an asset under the given directory func RestoreAsset(dir, name string) error { data, err := Asset(name) if err != nil { @@ -661,10 +626,14 @@ func RestoreAsset(dir, name string) error { if err != nil { return err } - return os.Chtimes(_filePath(dir, name), info.ModTime(), info.ModTime()) + err = os.Chtimes(_filePath(dir, name), info.ModTime(), info.ModTime()) + if err != nil { + return err + } + return nil } -// RestoreAssets restores an asset under the given directory recursively. +// RestoreAssets restores an asset under the given directory recursively func RestoreAssets(dir, name string) error { children, err := AssetDir(name) // File @@ -682,6 +651,7 @@ func RestoreAssets(dir, name string) error { } func _filePath(dir, name string) string { - canonicalName := strings.Replace(name, "\\", "/", -1) - return filepath.Join(append([]string{dir}, strings.Split(canonicalName, "/")...)...) + cannonicalName := strings.Replace(name, "\\", "/", -1) + return filepath.Join(append([]string{dir}, strings.Split(cannonicalName, "/")...)...) } +