Skip to content

Commit

Permalink
feat: insert policy refactor and fix update error.
Browse files Browse the repository at this point in the history
fixing update method which was exiting on panic, also improved the function of insert to be able to insert an array improving code quality
  • Loading branch information
afa7789 committed Oct 11, 2024
1 parent fc99a85 commit 72830bd
Showing 1 changed file with 32 additions and 23 deletions.
55 changes: 32 additions & 23 deletions zk/txpool/policy.go
Original file line number Diff line number Diff line change
Expand Up @@ -264,21 +264,18 @@ func UpdatePolicies(ctx context.Context, aclDB kv.RwDB, aclType string, addrs []
if err != nil {
return err
}

return aclDB.Update(ctx, func(tx kv.RwTx) error {
// Create an array to hold policy transactions
var policyTransactions []PolicyTransaction
timeNow := time.Now()
err = aclDB.Update(ctx, func(tx kv.RwTx) error {
for i, addr := range addrs {

// Insert policy transaction for adding or updating the policy
// I'm omiting the policies in this case.
err := InsertPolicyTransaction(ctx, aclDB, PolicyTransaction{
// Add the policy transaction to the array
policyTransactions = append(policyTransactions, PolicyTransaction{
aclType: ResolveACLTypeToBinary(aclType),
addr: addr,
operation: Update,
timeTx: time.Now(),
timeTx: timeNow,
})
if err != nil {
return err
}

if len(policies[i]) > 0 {
// just update the policies for the address to match the one provided
Expand All @@ -301,6 +298,13 @@ func UpdatePolicies(ctx context.Context, aclDB kv.RwDB, aclType string, addrs []

return nil
})
if err != nil {
return err
}

// Insert policy transaction for adding or updating the policy
// I'm omiting the policies in this case.
return InsertPolicyTransactions(ctx, aclDB, policyTransactions)
}

type PolicyTransaction struct {
Expand All @@ -319,16 +323,21 @@ func timestampToBytes(t time.Time) []byte {
return buf
}

func InsertPolicyTransaction(ctx context.Context, aclDB kv.RwDB, pt PolicyTransaction) error {
t := pt.timeTx
// Convert time.Time to bytes
unixBytes := timestampToBytes(t)
// composite key.
addressTimestamp := append(pt.addr.Bytes(), unixBytes...)
value := append([]byte{pt.aclType.ToByte(), pt.operation.ToByte(), pt.policy.ToByte()}, addressTimestamp...)

func InsertPolicyTransactions(ctx context.Context, aclDB kv.RwDB, pts []PolicyTransaction) error {
return aclDB.Update(ctx, func(tx kv.RwTx) error {
return tx.Put(PolicyTransactions, addressTimestamp, value)
for _, pt := range pts {
t := pt.timeTx
// Convert time.Time to bytes
unixBytes := timestampToBytes(t)
// composite key.
addressTimestamp := append(pt.addr.Bytes(), unixBytes...)
value := append([]byte{pt.aclType.ToByte(), pt.operation.ToByte(), pt.policy.ToByte()}, addressTimestamp...)

if err := tx.Put(PolicyTransactions, addressTimestamp, value); err != nil {
return err
}
}
return nil
})
}

Expand Down Expand Up @@ -481,13 +490,13 @@ func AddPolicy(ctx context.Context, aclDB kv.RwDB, aclType string, addr common.A
return err
}

err = InsertPolicyTransaction(ctx, aclDB, PolicyTransaction{
err = InsertPolicyTransactions(ctx, aclDB, []PolicyTransaction{{
aclType: ResolveACLTypeToBinary(aclType),
addr: addr,
policy: policy,
operation: Add,
timeTx: time.Now(),
})
}})

return err
}
Expand Down Expand Up @@ -527,13 +536,13 @@ func RemovePolicy(ctx context.Context, aclDB kv.RwDB, aclType string, addr commo
return err
}

err = InsertPolicyTransaction(ctx, aclDB, PolicyTransaction{
err = InsertPolicyTransactions(ctx, aclDB, []PolicyTransaction{{
aclType: ResolveACLTypeToBinary(aclType),
addr: addr,
policy: policy,
operation: Remove,
timeTx: time.Now(),
})
}})

return err
}
Expand Down

0 comments on commit 72830bd

Please sign in to comment.