delete opGetDelegate (#241)

fractalplatform · May 9, 2019 · 0518a87 · 0518a87
1 parent 3f93383
commit 0518a87
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 37 deletions.
diff --git a/params/gas_table.go b/params/gas_table.go
@@ -42,7 +42,6 @@ type GasTable struct {
 	DestroyAsset    uint64
 	AddAsset        uint64
 	GetAccountID    uint64
-	GetDelegate     uint64
 	CryptoCalc      uint64
 	CryptoByte      uint64
 	DeductGas       uint64
@@ -72,7 +71,6 @@ var (
 		DestroyAsset:    200,
 		AddAsset:        200,
 		GetAccountID:    200,
-		GetDelegate:     200,
 		CryptoCalc:      20000,
 		CryptoByte:      1000,
 		DeductGas:       200,

diff --git a/processor/vm/gas_table.go b/processor/vm/gas_table.go
@@ -456,9 +456,6 @@ func gasDeductGas(gt params.GasTable, evm *EVM, contract *Contract, stack *Stack
 	return gt.DeductGas, nil
 }
 
-func gasGetDelegate(gt params.GasTable, evm *EVM, contract *Contract, stack *Stack, mem *Memory, memorySize uint64) (uint64, error) {
-	return gt.GetDelegate, nil
-}
 func gasAddAsset(gt params.GasTable, evm *EVM, contract *Contract, stack *Stack, mem *Memory, memorySize uint64) (uint64, error) {
 
 	return gt.AddAsset, nil

diff --git a/processor/vm/instructions.go b/processor/vm/instructions.go
@@ -476,29 +476,6 @@ func opGetAssetAmount(pc *uint64, evm *EVM, contract *Contract, memory *Memory,
 	return nil, nil
 }
 
-func opGetDelegate(pc *uint64, evm *EVM, contract *Contract, memory *Memory, stack *Stack) ([]byte, error) {
-	time, account := stack.pop(), stack.pop()
-	t := time.Uint64()
-	userID := account.Uint64()
-
-	acct, err := evm.AccountDB.GetAccountById(userID)
-	if err == nil {
-		if acct != nil {
-			name := acct.GetName()
-			if dbalance, err := evm.Context.GetDelegatedByTime(evm.StateDB, name.String(), t); err == nil {
-				stack.push(dbalance)
-			}
-		} else {
-			err = errors.New("account object is null")
-		}
-	}
-
-	if err != nil {
-		stack.push(evm.interpreter.intPool.getZero())
-	}
-	evm.interpreter.intPool.put(time, account)
-	return nil, nil
-}
 func opSnapBalance(pc *uint64, evm *EVM, contract *Contract, memory *Memory, stack *Stack) ([]byte, error) {
 	opt, time, assetId, account := stack.pop(), stack.pop(), stack.pop(), stack.pop()
 	o := opt.Uint64()

diff --git a/processor/vm/jump_table.go b/processor/vm/jump_table.go
@@ -123,14 +123,6 @@ func NewByzantiumInstructionSet() [256]operation {
 		returns:       true,
 	}
 
-	instructionSet[GETDELEGATE] = operation{
-		execute:       opGetDelegate,
-		gasCost:       gasGetDelegate,
-		validateStack: makeStackFunc(2, 1),
-		valid:         true,
-		returns:       true,
-	}
-
 	instructionSet[ASSETAMOUNT] = operation{
 		execute:       opGetAssetAmount,
 		gasCost:       gasGetAssetAmount,

diff --git a/processor/vm/opcodes.go b/processor/vm/opcodes.go
@@ -214,7 +214,6 @@ const (
 	DESTROYASSET = 0xc8
 	GETACCOUNTID = 0xc9
 
-	GETDELEGATE    = 0xca
 	GETACCOUNTTIME = 0xcb
 	CRYPTOCALC     = 0xcc
 	DEDUCTGAS      = 0xcd