Remove prefix 'V' in struct names

io/bufferset.go

@@ -14,21 +14,21 @@ var (
 	ErrorNoChannel = errors.New("No suitable channels found.")
 )
 
-type VBufferSet struct {
+type BufferSet struct {
 	small  chan []byte
 	medium chan []byte
 	large  chan []byte
 }
 
-func NewVBufferSet() *VBufferSet {
-	bSet := new(VBufferSet)
+func NewBufferSet() *BufferSet {
+	bSet := new(BufferSet)
 	bSet.small = make(chan []byte, 128)
 	bSet.medium = make(chan []byte, 128)
 	bSet.large = make(chan []byte, 128)
 	return bSet
 }
 
-func (bSet *VBufferSet) detectBucket(size int, strict bool) (chan []byte, error) {
+func (bSet *BufferSet) detectBucket(size int, strict bool) (chan []byte, error) {
 	if strict {
 		if size == SizeSmall {
 			return bSet.small, nil
@@ -49,7 +49,7 @@ func (bSet *VBufferSet) detectBucket(size int, strict bool) (chan []byte, error)
 	return nil, ErrorNoChannel
 }
 
-func (bSet *VBufferSet) FetchBuffer(minSize int) []byte {
+func (bSet *BufferSet) FetchBuffer(minSize int) []byte {
 	var buffer []byte
 	byteChan, err := bSet.detectBucket(minSize, false)
 	if err != nil {
@@ -63,7 +63,7 @@ func (bSet *VBufferSet) FetchBuffer(minSize int) []byte {
 	return buffer
 }
 
-func (bSet *VBufferSet) ReturnBuffer(buffer []byte) {
+func (bSet *BufferSet) ReturnBuffer(buffer []byte) {
 	byteChan, err := bSet.detectBucket(len(buffer), true)
 	if err != nil {
 		return

io/socks/socks.go

@@ -186,7 +186,7 @@ func ReadRequest(reader io.Reader) (request *Socks5Request, err error) {
 	return
 }
 
-func (request *Socks5Request) Destination() v2net.VAddress {
+func (request *Socks5Request) Destination() v2net.Address {
 	switch request.AddrType {
 	case AddrTypeIPv4:
 		return v2net.IPAddress(request.IPv4[:], request.Port)

io/vmess/vmess.go

@@ -35,19 +35,19 @@ var (
 
 type VMessRequest struct {
 	Version        byte
-	UserId         core.VID
+	UserId         core.ID
 	RequestIV      [16]byte
 	RequestKey     [16]byte
 	ResponseHeader [4]byte
 	Command        byte
-	Address        v2net.VAddress
+	Address        v2net.Address
 }
 
 type VMessRequestReader struct {
-	vUserSet *core.VUserSet
+	vUserSet *core.UserSet
 }
 
-func NewVMessRequestReader(vUserSet *core.VUserSet) *VMessRequestReader {
+func NewVMessRequestReader(vUserSet *core.UserSet) *VMessRequestReader {
 	reader := new(VMessRequestReader)
 	reader.vUserSet = vUserSet
 	return reader

io/vmess/vmess_test.go

@@ -13,13 +13,13 @@ import (
 func TestVMessSerialization(t *testing.T) {
 	assert := unit.Assert(t)
 
-	userId, err := core.UUIDToVID("2b2966ac-16aa-4fbf-8d81-c5f172a3da51")
+	userId, err := core.UUIDToID("2b2966ac-16aa-4fbf-8d81-c5f172a3da51")
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	userSet := core.NewVUserSet()
-	userSet.AddUser(core.VUser{userId})
+	userSet := core.NewUserSet()
+	userSet.AddUser(core.User{userId})
 
 	request := new(VMessRequest)
 	request.Version = byte(0x01)