From c61bf0cd9c42f327f0f9e26eb7e563d2c108af94 Mon Sep 17 00:00:00 2001 From: Andrea Maria Piana Date: Mon, 27 Jul 2020 08:55:20 +0200 Subject: [PATCH] bump version --- VERSION | 2 +- multiaccounts/accounts/database_test.go | 27 ++++++++++++----------- peers/peerpool_test.go | 29 +++++++++++++++++++++---- 3 files changed, 40 insertions(+), 18 deletions(-) diff --git a/VERSION b/VERSION index 9dd7871a6..2f4c74eb2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.55.3 +0.56.0 diff --git a/multiaccounts/accounts/database_test.go b/multiaccounts/accounts/database_test.go index 6d26761ba..2725d821e 100644 --- a/multiaccounts/accounts/database_test.go +++ b/multiaccounts/accounts/database_test.go @@ -22,19 +22,20 @@ var ( networks = json.RawMessage("{}") settings = Settings{ - Address: types.HexToAddress("0xdC540f3745Ff2964AFC1171a5A0DD726d1F6B472"), - CurrentNetwork: "mainnet_rpc", - DappsAddress: types.HexToAddress("0xD1300f99fDF7346986CbC766903245087394ecd0"), - InstallationID: "d3efcff6-cffa-560e-a547-21d3858cbc51", - KeyUID: "0x4e8129f3edfc004875be17bf468a784098a9f69b53c095be1f52deff286935ab", - LatestDerivedPath: 0, - Name: "Jittery Cornflowerblue Kingbird", - Networks: &networks, - PhotoPath: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAIAAACRXR/mAAAAjklEQVR4nOzXwQmFMBAAUZXUYh32ZB32ZB02sxYQQSZGsod55/91WFgSS0RM+SyjA56ZRZhFmEWYRRT6h+M6G16zrxv6fdJpmUWYRbxsYr13dKfanpN0WmYRZhGzXz6AWYRZRIfbaX26fT9Jk07LLMIsosPt9I/dTDotswizCG+nhFmEWYRZhFnEHQAA///z1CFkYamgfQAAAABJRU5ErkJggg==", - PreviewPrivacy: false, - PublicKey: "0x04211fe0f69772ecf7eb0b5bfc7678672508a9fb01f2d699096f0d59ef7fe1a0cb1e648a80190db1c0f5f088872444d846f2956d0bd84069f3f9f69335af852ac0", - SigningPhrase: "yurt joey vibe", - WalletRootAddress: types.HexToAddress("0x3B591fd819F86D0A6a2EF2Bcb94f77807a7De1a6")} + Address: types.HexToAddress("0xdC540f3745Ff2964AFC1171a5A0DD726d1F6B472"), + CurrentNetwork: "mainnet_rpc", + DappsAddress: types.HexToAddress("0xD1300f99fDF7346986CbC766903245087394ecd0"), + InstallationID: "d3efcff6-cffa-560e-a547-21d3858cbc51", + KeyUID: "0x4e8129f3edfc004875be17bf468a784098a9f69b53c095be1f52deff286935ab", + LatestDerivedPath: 0, + Name: "Jittery Cornflowerblue Kingbird", + Networks: &networks, + PhotoPath: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAIAAACRXR/mAAAAjklEQVR4nOzXwQmFMBAAUZXUYh32ZB32ZB02sxYQQSZGsod55/91WFgSS0RM+SyjA56ZRZhFmEWYRRT6h+M6G16zrxv6fdJpmUWYRbxsYr13dKfanpN0WmYRZhGzXz6AWYRZRIfbaX26fT9Jk07LLMIsosPt9I/dTDotswizCG+nhFmEWYRZhFnEHQAA///z1CFkYamgfQAAAABJRU5ErkJggg==", + PreviewPrivacy: false, + PublicKey: "0x04211fe0f69772ecf7eb0b5bfc7678672508a9fb01f2d699096f0d59ef7fe1a0cb1e648a80190db1c0f5f088872444d846f2956d0bd84069f3f9f69335af852ac0", + SigningPhrase: "yurt joey vibe", + SendPushNotifications: true, + WalletRootAddress: types.HexToAddress("0x3B591fd819F86D0A6a2EF2Bcb94f77807a7De1a6")} ) func setupTestDB(t *testing.T) (*Database, func()) { diff --git a/peers/peerpool_test.go b/peers/peerpool_test.go index d8b8b8b26..45e7018e8 100644 --- a/peers/peerpool_test.go +++ b/peers/peerpool_test.go @@ -30,6 +30,21 @@ import ( "github.com/status-im/status-go/whisper/v6" ) +// GetFreePort asks the kernel for a free open port that is ready to use. +func getFreePort() (int, error) { + addr, err := net.ResolveTCPAddr("tcp", "localhost:0") + if err != nil { + return 0, err + } + + l, err := net.ListenTCP("tcp", addr) + if err != nil { + return 0, err + } + defer l.Close() + return l.Addr().(*net.TCPAddr).Port, nil +} + type PeerPoolSimulationSuite struct { suite.Suite @@ -41,14 +56,20 @@ type PeerPoolSimulationSuite struct { } func TestPeerPoolSimulationSuite(t *testing.T) { - s := new(PeerPoolSimulationSuite) - s.port = 33731 + s := &PeerPoolSimulationSuite{} + port, err := getFreePort() + if err != nil { + panic(err) + } + s.port = uint16(port) + suite.Run(t, s) } func (s *PeerPoolSimulationSuite) nextPort() uint16 { - s.port++ - return s.port + port, err := getFreePort() + s.Require().NoError(err) + return uint16(port) } func (s *PeerPoolSimulationSuite) SetupTest() {