[WIP] P-Chain merkle DB -- smaller diff (#2382)

ava-labs · Nov 29, 2023 · 1161e11 · 1161e11
1 parent 764c24f
commit 1161e11
Show file tree

Hide file tree

Showing 8 changed files with 1,079 additions and 1,110 deletions.
diff --git a/vms/platformvm/state/diff.go b/vms/platformvm/state/diff.go
@@ -331,9 +331,12 @@ func (d *diff) GetSubnetTransformation(subnetID ids.ID) (*txs.Tx, error) {
 func (d *diff) AddSubnetTransformation(transformSubnetTxIntf *txs.Tx) {
 	transformSubnetTx := transformSubnetTxIntf.Unsigned.(*txs.TransformSubnetTx)
 	if d.transformedSubnets == nil {
-		d.transformedSubnets = make(map[ids.ID]*txs.Tx)
+		d.transformedSubnets = map[ids.ID]*txs.Tx{
+			transformSubnetTx.Subnet: transformSubnetTxIntf,
+		}
+	} else {
+		d.transformedSubnets[transformSubnetTx.Subnet] = transformSubnetTxIntf
 	}
-	d.transformedSubnets[transformSubnetTx.Subnet] = transformSubnetTxIntf
 }
 
 func (d *diff) GetChains(subnetID ids.ID) ([]*txs.Tx, error) {

diff --git a/vms/platformvm/state/masked_iterator_test.go b/vms/platformvm/state/masked_iterator_test.go
@@ -17,23 +17,19 @@ func TestMaskedIterator(t *testing.T) {
 	stakers := []*Staker{
 		{
 			TxID:     ids.GenerateTestID(),
-			Weight:   0, // just to simplify debugging
 			NextTime: time.Unix(0, 0),
 		},
 		{
 			TxID:     ids.GenerateTestID(),
-			Weight:   10, // just to simplify debugging
-			NextTime: time.Unix(10, 0),
+			NextTime: time.Unix(1, 0),
 		},
 		{
 			TxID:     ids.GenerateTestID(),
-			Weight:   20, // just to simplify debugging
-			NextTime: time.Unix(20, 0),
+			NextTime: time.Unix(2, 0),
 		},
 		{
 			TxID:     ids.GenerateTestID(),
-			Weight:   30, // just to simplify debugging
-			NextTime: time.Unix(30, 0),
+			NextTime: time.Unix(3, 0),
 		},
 	}
 	maskedStakers := map[ids.ID]*Staker{

diff --git a/vms/platformvm/state/staker_test.go b/vms/platformvm/state/staker_test.go
@@ -144,7 +144,7 @@ func TestNewCurrentStaker(t *testing.T) {
 	subnetID := ids.GenerateTestID()
 	weight := uint64(12345)
 	startTime := time.Now()
-	endTime := startTime.Add(time.Hour)
+	endTime := time.Now()
 	potentialReward := uint64(54321)
 	currentPriority := txs.SubnetPermissionedValidatorCurrentPriority