rename VMessAccount to vmess.Account

common/protocol/server_spec_test.go

@@ -5,30 +5,33 @@ import (
 
 	v2net "github.com/v2ray/v2ray-core/common/net"
 	. "github.com/v2ray/v2ray-core/common/protocol"
-	"github.com/v2ray/v2ray-core/common/uuid"
 	"github.com/v2ray/v2ray-core/testing/assert"
 )
 
+type TestAccount struct {
+	id int
+}
+
+func (this *TestAccount) Equals(account Account) bool {
+	return account.(*TestAccount).id == this.id
+}
+
 func TestReceiverUser(t *testing.T) {
 	assert := assert.On(t)
 
-	id := NewID(uuid.New())
-	alters := NewAlterIDs(id, 100)
-	account := &VMessAccount{
-		ID:       id,
-		AlterIDs: alters,
+	account := &TestAccount{
+		id: 0,
 	}
-	user := NewUser(account, UserLevel(0), "")
+	user := NewUser(UserLevel(0), "")
+	user.Account = account
 	rec := NewServerSpec(v2net.TCPDestination(v2net.DomainAddress("v2ray.com"), 80), AlwaysValid(), user)
 	assert.Bool(rec.HasUser(user)).IsTrue()
 
-	id2 := NewID(uuid.New())
-	alters2 := NewAlterIDs(id2, 100)
-	account2 := &VMessAccount{
-		ID:       id2,
-		AlterIDs: alters2,
+	account2 := &TestAccount{
+		id: 1,
 	}
-	user2 := NewUser(account2, UserLevel(0), "")
+	user2 := NewUser(UserLevel(0), "")
+	user2.Account = account2
 	assert.Bool(rec.HasUser(user2)).IsFalse()
 
 	rec.AddUser(user2)