From a6645bd20953d022929b4acaeca5a6fe6f2a86dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?rich=CE=9Brd?= Date: Fri, 16 Aug 2024 14:26:35 -0400 Subject: [PATCH] chore_: remove `status.test` fleet (#5702) --- _assets/scripts/update-fleet-config.sh | 2 +- cmd/statusd/main.go | 1 - config/cli/fleet-status.test.json | 25 ------------------------- params/cluster.go | 1 - services/mailservers/fleet.go | 18 ------------------ static/bindata.go | 24 ------------------------ 6 files changed, 1 insertion(+), 70 deletions(-) delete mode 100644 config/cli/fleet-status.test.json diff --git a/_assets/scripts/update-fleet-config.sh b/_assets/scripts/update-fleet-config.sh index 518f767d9..83105f8f7 100755 --- a/_assets/scripts/update-fleet-config.sh +++ b/_assets/scripts/update-fleet-config.sh @@ -10,7 +10,7 @@ fleets=( wakufleets=( 'status.prod' - 'status.test' + 'status.staging' 'waku.sandbox' 'waku.test' ) diff --git a/cmd/statusd/main.go b/cmd/statusd/main.go index 955fa78fb..6bc248dd4 100644 --- a/cmd/statusd/main.go +++ b/cmd/statusd/main.go @@ -74,7 +74,6 @@ var ( params.FleetProd, params.FleetStatusStaging, params.FleetStatusProd, - params.FleetStatusTest, params.FleetWakuSandbox, params.FleetWakuTest, }, diff --git a/config/cli/fleet-status.test.json b/config/cli/fleet-status.test.json deleted file mode 100644 index cf2adbae3..000000000 --- a/config/cli/fleet-status.test.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "Rendezvous": false, - "NoDiscovery": true, - "ClusterConfig": { - "Enabled": true, - "Fleet": "status.test", - "BootNodes": [], - "TrustedMailServers": [], - "PushNotificationsServers": [ - "401ba5eda402678dc78a0a40fd0795f4ea8b1e34972c4d15cf33ac01292341c89f0cbc637fa9f7a3ffe0b9dfe90e9cdae7a14925500ab01b6a91c67bae42a97a", - "181141b1d111908aaf05f4788e6778ec07073a1d4e1ce43c73815c40ee4e7345a1cbf5a90a45f601bf3763f12be63b01624ba1f36eeb9572455e7034b8f9f2c4", - "5ffc34d5ffda180d94cd3974d9ed2bb082ede68f342babdbe801ceffb7da902087d43f9aa961c7b85029358874c08ef04ecad9f1d95a1f0e448cbdd5d04350c7" - ], - "StaticNodes": [], - "RendezvousNodes": [], - "WakuNodes": [ - "/dns4/node-01.do-ams3.status.test.statusim.net/tcp/30303/p2p/16Uiu2HAkukebeXjTQ9QDBeNDWuGfbaSg79wkkhK4vPocLgR6QFDf", - "/dns4/node-01.gc-us-central1-a.status.test.statusim.net/tcp/30303/p2p/16Uiu2HAmGDX3iAFox93PupVYaHa88kULGqMpJ7AEHGwj3jbMtt76", - "/dns4/node-01.ac-cn-hongkong-c.status.test.statusim.net/tcp/30303/p2p/16Uiu2HAm2BjXxCp1sYFJQKpLLbPbwd5juxbsYofu3TsS3auvT9Yi" - ] - }, - "WakuV2Config": { - "Enabled": true - } -} diff --git a/params/cluster.go b/params/cluster.go index 250f5e022..e0b143f6b 100644 --- a/params/cluster.go +++ b/params/cluster.go @@ -6,7 +6,6 @@ const ( FleetProd = "eth.prod" FleetStatusStaging = "status.staging" FleetStatusProd = "status.prod" - FleetStatusTest = "status.test" FleetWakuSandbox = "waku.sandbox" FleetWakuTest = "waku.test" ) diff --git a/services/mailservers/fleet.go b/services/mailservers/fleet.go index c0d97e3ef..e25e0894a 100644 --- a/services/mailservers/fleet.go +++ b/services/mailservers/fleet.go @@ -105,24 +105,6 @@ func DefaultMailservers() []Mailserver { Fleet: params.FleetWakuTest, Version: 2, }, - Mailserver{ - ID: "node-01.ac-cn-hongkong-c.status.test", - Address: "/dns4/node-01.ac-cn-hongkong-c.status.test.statusim.net/tcp/30303/p2p/16Uiu2HAm2BjXxCp1sYFJQKpLLbPbwd5juxbsYofu3TsS3auvT9Yi", - Fleet: params.FleetStatusTest, - Version: 2, - }, - Mailserver{ - ID: "node-01.do-ams3.status.test", - Address: "/dns4/node-01.do-ams3.status.test.statusim.net/tcp/30303/p2p/16Uiu2HAkukebeXjTQ9QDBeNDWuGfbaSg79wkkhK4vPocLgR6QFDf", - Fleet: params.FleetStatusTest, - Version: 2, - }, - Mailserver{ - ID: "node-01.gc-us-central1-a.status.test", - Address: "/dns4/node-01.gc-us-central1-a.status.test.statusim.net/tcp/30303/p2p/16Uiu2HAmGDX3iAFox93PupVYaHa88kULGqMpJ7AEHGwj3jbMtt76", - Fleet: params.FleetStatusTest, - Version: 2, - }, Mailserver{ ID: "store-01.do-ams3.status.prod", Address: "/dns4/store-01.do-ams3.status.prod.status.im/tcp/30303/p2p/16Uiu2HAmAUdrQ3uwzuE4Gy4D56hX6uLKEeerJAnhKEHZ3DxF1EfT", diff --git a/static/bindata.go b/static/bindata.go index eea899acd..ef5f3f9e8 100644 --- a/static/bindata.go +++ b/static/bindata.go @@ -7,7 +7,6 @@ // ../config/cli/fleet-eth.prod.json (3.619kB) // ../config/cli/fleet-status.prod.json (2.568kB) // ../config/cli/fleet-status.staging.json (2.631kB) -// ../config/cli/fleet-status.test.json (1.138kB) // ../config/cli/fleet-waku.sandbox.json (1.133kB) // ../config/cli/fleet-waku.test.json (1.13kB) // ../config/cli/les-enabled.json (58B) @@ -228,26 +227,6 @@ func ConfigCliFleetStatusStagingJson() (*asset, error) { return a, nil } -var _ConfigCliFleetStatusTestJson = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x94\x54\x4d\x4f\x1c\x47\x10\xbd\xf3\x2b\x46\x73\xce\xb0\xd5\x5f\xd3\xdd\xdc\x80\x35\x20\x1b\x10\x18\x6c\x83\xa2\x1c\xaa\xab\xab\x96\xd9\x5d\x66\x36\x3b\x33\x0b\x49\xe4\xff\x1e\x2d\x59\x07\x2c\x2b\x91\x7c\x6b\xbd\xf7\x54\xf5\xaa\x5f\xa9\xfe\xda\x2b\x8a\xf2\x23\xb7\x99\xff\xdc\x74\x63\x5f\x1e\x14\x82\xcb\x9e\x7f\xd9\xc2\x97\xdd\xb4\xe9\xa9\xdb\xf0\xfa\x8f\xf2\xa0\x18\xd6\xe3\x3f\xf0\xf1\x72\xec\x07\x5e\x1f\x77\xad\x34\xb3\xf2\xa0\xd8\x96\x28\x8a\xf2\x5d\x8b\x69\xc9\xf9\x8d\xb2\x28\xca\x93\x25\xf3\x50\x1e\x14\x65\x3f\xe0\x30\xf6\xfb\x03\xf7\x43\xb9\xe3\x8e\xba\x6e\xb8\xec\x32\x6f\x9b\xfe\xfa\xdb\x0e\xbc\x5d\x6f\x8b\xe7\x0b\x6c\x96\x37\xbc\xde\xf0\xfa\x3b\xf6\x6a\xec\x1f\x2e\xbb\xa1\x91\x86\x70\x68\xba\xb6\x7f\xa3\x79\x51\x14\x45\x69\x41\x25\x74\x9c\xd1\x82\xae\x7d\xc8\xe4\x03\x02\x5a\x90\x0c\x3e\x3a\xb1\x8c\x21\x29\x36\x36\x7a\x4d\x36\x2b\x47\x62\x0c\x12\x28\x1d\xb5\xb1\x8a\x42\x14\xa0\x44\xb5\xf1\x82\x51\x3c\x1a\x11\x86\x14\xb3\x70\x04\x8e\x94\x91\x3d\x2a\x1b\xb5\x73\x00\x98\x40\xa5\x1a\xa3\xa2\xda\x27\x64\xab\x31\x7a\xdc\x8d\x57\x14\xa5\x0a\x4a\x59\x95\x54\x56\x4a\x45\x08\x88\x02\x4e\xac\x0f\x81\x6b\xef\x03\x13\x78\xf0\x06\x55\xb6\xac\x88\xad\x21\x6f\x82\x72\x64\x81\xd9\xb2\x37\xd6\xa1\xa2\x24\x0e\x23\xa0\x75\x52\x83\x4a\x62\x7c\x6d\x44\xe9\xc4\xb5\x49\xa0\x6a\x6d\x13\x2a\x31\x35\x73\x8a\xce\x6b\xeb\x1c\x7b\x30\x36\x05\x89\xa2\xc9\xbe\x3a\x71\x22\x64\x6c\x76\x22\x19\x55\x80\x1c\x2d\x65\x13\xbd\xcd\x91\xb3\x4e\x09\x82\xe6\xcc\x75\x10\x63\x75\xc2\x94\x13\x07\x50\xc4\x22\xc9\x67\x8c\xa0\x21\xf8\x6c\x8d\x44\xc4\x58\x2b\xf2\x29\x38\xd0\xd1\xb8\x10\xbc\x25\x08\x2c\x60\x99\x30\x47\x51\x39\x3a\x54\x02\x6c\x6d\xa0\x94\xb3\xcb\x60\x8d\x03\xf2\xe5\x8b\x91\x6f\x29\xde\x0c\x38\x34\xf4\x43\xf4\xaf\x5b\xf8\x03\xf5\x05\x17\xe3\xbf\xe0\xb7\xa1\x26\xb9\xed\xed\xa4\xed\x32\x57\xa0\xf6\x73\x57\xe1\x63\x6f\xf6\xdf\x2c\xda\xee\xdd\x3c\xee\xb7\x3c\x4c\x06\x5a\x4d\x0c\x18\x30\x93\x95\x5e\x4d\x54\xfd\xa9\x19\xf5\xd9\xe1\x62\x5c\x70\xe2\xbb\xf9\xed\x75\xbc\x9e\x1e\xf1\xe5\xf4\xcb\x78\x2a\x09\x6f\x66\x3e\x3e\x2d\x16\x0f\x1f\xec\xe6\xaa\xa3\xf3\xd9\xc7\xfa\xfa\x64\x2a\xaf\x1f\xfa\x7d\xef\x19\x55\x63\x5f\x11\xb7\xc3\x1a\x97\xaa\xc2\x9f\x35\xf1\x78\x3a\xbd\x33\xcd\xe1\x49\xf7\x1c\xcd\xd5\xb8\xfa\x7c\x8f\x67\x18\xc2\xe2\xd3\xf9\xe9\xef\x17\xab\xf7\xfe\xf0\xdd\xd9\xe9\xd3\xdc\xcc\xd3\xc5\x30\xf8\xfa\xbf\x4c\x20\x55\xd4\x56\x0f\x5d\x3b\x5b\x74\xed\xac\xa2\x9f\x36\xa1\x8f\xe6\x77\xcf\xc7\x2b\xd5\xdf\x9f\xbc\xbf\xfe\xb0\x3a\x3f\x4f\x57\xe9\x29\xbb\xf9\xf8\x9c\xfa\xfb\x4e\x46\x73\xdb\xdf\x18\x1c\x37\xb7\xf1\xbe\xd9\x05\xba\x57\x14\x5f\x5f\x6e\xc2\x36\xa0\xcf\xfa\xff\x4f\xc2\x56\xbc\xf7\x75\xef\xef\x00\x00\x00\xff\xff\xf9\x0f\x85\xec\x72\x04\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: 1138, mode: os.FileMode(0664), modTime: time.Unix(1700000000, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x71, 0x2c, 0xfb, 0x4f, 0x90, 0xa5, 0xb, 0x87, 0xcf, 0xc2, 0x61, 0xdb, 0x22, 0x86, 0xef, 0x4a, 0xcf, 0xba, 0xe8, 0x2c, 0x12, 0x3d, 0x44, 0xa, 0x59, 0x4a, 0xd6, 0xd8, 0xa4, 0xe7, 0x49, 0x91}} - return a, nil -} - var _ConfigCliFleetWakuSandboxJson = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x94\x54\x4d\x6f\xdb\x46\x10\xbd\xfb\x57\x10\x3c\x97\xd2\xec\x17\x77\xd7\xb7\xca\x96\x50\x24\x90\x50\x49\x96\x1d\xbb\xe8\x61\x76\x77\x46\xa6\x25\x91\x8a\x48\x2a\x76\x8a\xfc\xf7\x42\xae\x53\x3b\x08\x5a\xc0\xd7\xf7\x1e\x66\xde\xcc\x1b\xcc\x5f\x67\x59\x96\x2f\xa8\x4e\xf4\xf5\xd8\xf4\x6d\x7e\x9e\x31\x6e\x5b\xfa\xe5\x04\xcf\x9a\xcb\xaa\x8d\xcd\x91\x0e\x4f\xf9\x79\xd6\x1d\xfa\x7f\xe0\x8b\x6d\xdf\x76\x74\xb8\x68\x6a\xae\xd6\xf9\x79\x76\x2a\x91\x65\xf9\xb8\xc6\xb0\xa5\xf4\x46\x99\x65\xf9\x64\x4b\xd4\xe5\xe7\x59\xfe\x05\x37\xfd\xa0\xc5\x3a\x85\xe6\x31\x7f\x21\x47\x4d\xd3\xcd\x9a\x44\xa7\xae\x7f\xfc\xf9\x02\x5e\x1d\x4e\xd5\xd3\x14\xab\xed\x92\x0e\x47\x3a\xfc\xc0\xfe\xde\xb7\xf7\xb3\xa6\xab\xb8\x8a\xd8\x55\x4d\xdd\xbe\xd1\x3c\x2b\xb2\x2c\xd7\x20\x02\x1a\x4a\xa8\x41\x96\xd6\xa5\x68\x1d\x02\x6a\xe0\x04\xd6\x1b\xd6\x84\x2e\x08\x52\xda\x5b\x19\x75\x12\x26\xb2\x52\x18\x41\x48\x2f\x95\x16\xd1\x79\x86\x18\x62\xa9\x2c\xa3\x67\x8b\x8a\x99\x20\xf8\xc4\xe4\x81\x7c\x4c\x48\x16\x85\xf6\xd2\x18\x00\x0c\x20\x42\x89\x5e\xc4\xd2\x06\x24\x2d\xd1\x5b\x7c\x19\x2f\xcb\x72\xe1\x84\xd0\x22\x88\x24\x84\xf0\xe0\x10\x19\x0c\x6b\xeb\x1c\x95\xd6\x3a\x8a\x60\xc1\x2a\x14\x49\x93\x88\xa4\x55\xb4\xca\x09\x13\x35\x10\x69\xb2\x4a\x1b\x14\x31\xb0\x41\x0f\xa8\x0d\x97\x20\x02\x2b\x5b\x2a\x16\x32\x50\xa9\x02\x88\x52\xea\x80\x82\x55\x49\x14\xbc\xb1\x52\x1b\x43\x16\x94\x0e\x8e\x3d\xcb\xa8\x5f\x9d\x18\xe6\xa8\x74\x32\xcc\x09\x85\x83\xe4\x75\x4c\xca\x5b\x9d\x3c\x25\x19\x02\x38\x49\x89\x4a\xc7\x4a\xcb\x80\x21\x05\x72\x20\x22\x31\x07\x9b\xd0\x83\x04\x67\x93\x56\xec\x11\x7d\x29\xa2\x0d\xce\x80\xf4\xca\x38\x67\x75\x04\x47\x0c\x9a\x22\x26\xcf\x22\x79\x83\x82\x81\xb4\x76\x31\xa4\x64\x12\x68\x65\x20\xda\xfc\xd9\xc8\xf7\x14\x97\x1d\x76\x55\xfc\x29\xfa\xd7\x33\xfc\x89\xba\xc1\x4d\xff\x2f\xf8\x7d\xa8\x61\xaa\x5b\x3d\xac\x9b\x44\x05\x88\x41\x6a\x0a\xdc\xb5\x6a\xf0\xf6\xd2\x06\x6d\x87\x5d\xdf\x0e\xaa\xdd\xb0\x8b\xfb\xa1\x02\x05\x6a\xb8\x97\xfb\xa1\x28\x57\x55\x2f\x7f\xfb\x75\x37\x5f\x4e\x67\xe3\x47\x5e\xdd\xae\x3e\x73\xff\xe9\x66\x73\x69\x2e\x71\x76\x57\x4f\x6f\xeb\x6a\xbd\x78\x9c\x7c\x0c\x1b\xd5\xc5\xf1\x64\x4e\x73\x1a\xbf\xae\xf3\xc7\xce\xeb\x58\xf4\x6d\x11\xa9\xee\x0e\xb8\x15\x05\xbe\xd3\x42\xc9\x4f\x9f\xc7\xe2\x61\x64\xa6\x4d\xfd\xf5\xd8\x4c\xd3\xca\x1d\x6d\x19\x6e\xae\xdd\x1d\xcd\xf6\x75\xbc\xc4\xdd\xad\x98\xce\x3f\xf1\x43\x1a\xfd\x97\x05\x8c\x45\xac\x8b\xfb\xa6\x5e\x6f\x9a\x7a\x5d\xc4\x77\x5a\x58\x7e\x38\x2e\x3f\xec\xef\x1f\x17\x29\xd4\xd5\x7a\x75\x6d\xc2\xc3\x62\x71\x37\x19\xdd\x5f\x75\x37\x93\xab\xe5\x53\xf5\x11\xe7\xa3\xa7\x8b\x87\x2f\xbb\xfd\xf5\x4b\x94\x67\x59\xf6\xed\xf9\x1d\x9c\xa2\xb9\x96\xff\xff\x0d\x4e\xe2\xb3\x6f\x67\x7f\x07\x00\x00\xff\xff\x07\x70\x8a\xdf\x6d\x04\x00\x00") func ConfigCliFleetWakuSandboxJsonBytes() ([]byte, error) { @@ -593,8 +572,6 @@ var _bindata = map[string]func() (*asset, error){ "../config/cli/fleet-status.staging.json": ConfigCliFleetStatusStagingJson, - "../config/cli/fleet-status.test.json": ConfigCliFleetStatusTestJson, - "../config/cli/fleet-waku.sandbox.json": ConfigCliFleetWakuSandboxJson, "../config/cli/fleet-waku.test.json": ConfigCliFleetWakuTestJson, @@ -670,7 +647,6 @@ var _bintree = &bintree{nil, map[string]*bintree{ "fleet-eth.prod.json": &bintree{ConfigCliFleetEthProdJson, map[string]*bintree{}}, "fleet-status.prod.json": &bintree{ConfigCliFleetStatusProdJson, map[string]*bintree{}}, "fleet-status.staging.json": &bintree{ConfigCliFleetStatusStagingJson, map[string]*bintree{}}, - "fleet-status.test.json": &bintree{ConfigCliFleetStatusTestJson, map[string]*bintree{}}, "fleet-waku.sandbox.json": &bintree{ConfigCliFleetWakuSandboxJson, map[string]*bintree{}}, "fleet-waku.test.json": &bintree{ConfigCliFleetWakuTestJson, map[string]*bintree{}}, "les-enabled.json": &bintree{ConfigCliLesEnabledJson, map[string]*bintree{}},