Merge branch 'alicenet:main' into bondingCurveGas

alicenet · Aug 10, 2022 · dbb216c · dbb216c
2 parents 1513773 + 464a465
commit dbb216c
Show file tree

Hide file tree

Showing 221 changed files with 1,521 additions and 7,575 deletions.
diff --git a/application/minedtx/mockstorage_test.go b/application/minedtx/mockstorage_test.go
@@ -13,15 +13,13 @@ import (
 func makeMockStorageGetter() *mockStorageGetter {
 	maxBytes := uint32(0)
 	dataStoreEpochFee := new(big.Int).SetInt64(0)
-	atomicSwapFee := new(big.Int).SetInt64(0)
 	valueStoreFee := new(big.Int).SetInt64(0)
 	minTxFee := new(big.Int).SetInt64(0)
 
 	msg := &mockStorageGetter{
 		maxBytes:          maxBytes,
 		dataStoreEpochFee: dataStoreEpochFee,
 		valueStoreFee:     valueStoreFee,
-		atomicSwapFee:     atomicSwapFee,
 		minTxFee:          minTxFee,
 	}
 	return msg
@@ -36,7 +34,6 @@ type mockStorageGetter struct {
 	maxBytes          uint32
 	dataStoreEpochFee *big.Int
 	valueStoreFee     *big.Int
-	atomicSwapFee     *big.Int
 	minTxFee          *big.Int
 }
 
@@ -122,21 +119,6 @@ func (msg *mockStorageGetter) GetValueStoreValidVersion() uint32 {
 	return 0
 }
 
-func (msg *mockStorageGetter) GetAtomicSwapFee() *big.Int {
-	return msg.atomicSwapFee
-}
-
-func (msg *mockStorageGetter) SetAtomicSwapFee(value *big.Int) {
-	if value == nil {
-		panic("invalid value")
-	}
-	msg.atomicSwapFee.Set(value)
-}
-
-func (msg *mockStorageGetter) GetAtomicSwapValidStopEpoch() uint32 {
-	return 0
-}
-
 func (msg *mockStorageGetter) GetMinTxFee() *big.Int {
 	return msg.minTxFee
 }