github/v2ray-core
4
0
Fork 0
mirror of https://github.com/v2ray/v2ray-core.git synced 2024-04-21 12:31:52 +00:00
Code Issues Releases Wiki Activity

migrate NetworkList to []Network

Browse Source
This commit is contained in:
Darien Raymond
2018-11-20 16:58:26 +01:00
parent 7b80322b60
commit 769f770cf7
18 changed files with 167 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files
testing/mocks/proxy.go
+2 -2
View File
@@ -38,9 +38,9 @@ func (m *ProxyInbound) EXPECT() *ProxyInboundMockRecorder {
}
// Network mocks base method
func (m *ProxyInbound) Network() net.NetworkList {
func (m *ProxyInbound) Network() []net.Network {
ret := m.ctrl.Call(m, "Network")
ret0, _ := ret[0].(net.NetworkList)
ret0, _ := ret[0].([]net.Network)
return ret0
}
testing/scenarios/command_test.go
+9 -15
View File
@@ -71,11 +71,9 @@ func TestCommanderRemoveHandler(t *testing.T) {
Listen: net.NewIPOrDomain(net.LocalHostIP),
}),
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_TCP},
},
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
Networks: []net.Network{net.Network_TCP},
}),
},
{
@@ -85,11 +83,9 @@ func TestCommanderRemoveHandler(t *testing.T) {
Listen: net.NewIPOrDomain(net.LocalHostIP),
}),
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_TCP},
},
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
Networks: []net.Network{net.Network_TCP},
}),
},
},
@@ -218,11 +214,9 @@ func TestCommanderAddRemoveUser(t *testing.T) {
Listen: net.NewIPOrDomain(net.LocalHostIP),
}),
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_TCP},
},
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
Networks: []net.Network{net.Network_TCP},
}),
},
},