Skip to content

Commit d64460a

Browse files
committed
Merge branch 'master' into fix-proof-verification
2 parents 842f70d + 376c72a commit d64460a

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed

database/iterator.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// See the file LICENSE for licensing terms.
33

44
// For ease of implementation, our database's interface matches Ethereum's
5-
// database implementation. This was to allow use to use Geth code as is for the
5+
// database implementation. This was to allow us to use Geth code as is for the
66
// EVM chain.
77

88
package database
@@ -28,7 +28,7 @@ type Iterator interface {
2828

2929
// Error returns any accumulated error. Exhausting all the key/value pairs
3030
// is not considered to be an error.
31-
// Error should be called after all key/value pairs have been exhausted ie.
31+
// Error should be called after all key/value pairs have been exhausted i.e.
3232
// after Next() has returned false.
3333
Error() error
3434

@@ -43,7 +43,7 @@ type Iterator interface {
4343
Value() []byte
4444

4545
// Release releases associated resources. Release should always succeed and
46-
// can be called multiple times without causing error.
46+
// can be called multiple times without causing an error.
4747
Release()
4848
}
4949

tests/fixture/bootstrapmonitor/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ and initiates a new test when one is found.
170170
to the available storage of 30GB being insufficient for even state
171171
sync bootstrap.
172172
- Self-hosted github workers are not compatible with bootstrap testing
173-
due to the 5 day maximum duration for a job running on a self-hosted
173+
due to the 5-day maximum duration for a job running on a self-hosted
174174
runner. State sync bootstrap usually completes within 5 days, but full
175175
sync bootstrap usually takes much longer.
176176

vms/platformvm/docs/mempool_gossiping.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ In conjunction with the introduction of [Snowman++](../../proposervm), the mempo
88

99
The PlatformVM's mempool performs the following workflow:
1010

11-
- An unconfirmed transaction is provided to `node A`, either through mempool gossiping or direct issuance over a RPC. If this transaction isn't already in the local mempool, the transaction is issued into the mempool.
11+
- An unconfirmed transaction is provided to `node A`, either through mempool gossiping or direct issuance over an RPC. If this transaction isn't already in the local mempool, the transaction is issued into the mempool.
1212
- When `node A` issues a new transaction into its mempool, it will gossip the transaction ID by sending an `AppGossip` message. The node's engine will randomly select peers (currently defaulting to `6` nodes) to send the `AppGossip` message to.
1313
- When `node B` learns about the existence of a remote transaction ID, it will check if its mempool contains the transaction or if it has been recently dropped. If the transaction ID is not known, `node B` will generate a new `requestID` and respond with an `AppRequest` message with the unknown transaction's ID. `node B` will track the content of the request issued with `requestID` for response verification.
1414
- Upon reception of an `AppRequest` message, `node A` will attempt to fetch the transaction requested in the `AppRequest` message from its mempool. Note that a transaction advertised in an `AppGossip` message may no longer be in the mempool, because they may have been included into a block, rejected, or dropped. If the transaction is retrieved, it is encoded into an `AppResponse` message. The `AppResponse` message will carry the same `requestID` of the originating `AppRequest` message and it will be sent back to `node B`.

vms/proposervm/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ Generally speaking the `proposerVM` wraps an inner block generated by the inner
7171
There are three kinds of `proposervm.Blocks`:
7272

7373
- `preForkBlock` is a simple wrapper of an inner block. A `preForkBlock` does not change the ID or serialization of an inner block; it's simply an in-memory object allowing correct verification of `preForkBlocks` (see [Execution modes](#execution-modes) section below for further details of why this is required).
74-
- `postForkBlock` adds congestion-control related fields to an inner block, resulting in a different ID and serialization than the inner block. Note that for such blocks, serialization is a two step process: the header is serialized at the `proposerVM` level, while the inner block serialization is deferred to the inner VM.
74+
- `postForkBlock` adds congestion-control related fields to an inner block, resulting in a different ID and serialization than the inner block. Note that for such blocks, serialization is a two-step process: the header is serialized at the `proposerVM` level, while the inner block serialization is deferred to the inner VM.
7575
- `postForkOption` wraps inner blocks that are associated with an Oracle Block. This enables oracle blocks to be issued without enforcing the congestion control mechanism. Similarly to `postForkBlocks`, this changes the block's ID and serialization.
7676

7777
### Execution modes

vms/rpcchainvm/runtime/subprocess/initializer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414

1515
var _ runtime.Initializer = (*initializer)(nil)
1616

17-
// Subprocess VM Runtime intializer.
17+
// Subprocess VM Runtime initializer.
1818
type initializer struct {
1919
path string
2020

x/merkledb/trie_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ func TestVisitPathToKey(t *testing.T) {
239239
require.Equal(trie.root.Value(), nodePath[0])
240240
}
241241

242-
func Test_Trie_ViewOnCommitedView(t *testing.T) {
242+
func Test_Trie_ViewOnCommittedView(t *testing.T) {
243243
require := require.New(t)
244244

245245
dbTrie, err := getBasicDB()

x/sync/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
## Overview
44

55
This package implements a client and server that allows for the syncing of a [MerkleDB](../merkledb/README.md).
6-
The servers have an up to date version of the database, and the clients have an out of date version of the database or an empty database.
6+
The servers have an up-to-date version of the database, and the clients have an out of date version of the database or an empty database.
77

88
It's planned that these client and server implementations will eventually be compatible with Firewood.
99

@@ -62,7 +62,7 @@ are in range [`start`, `end`] for the revision with root `root_hash`" for some k
6262
Note that `root_hash` is the root hash of the revision that the client is trying to sync to, not the
6363
root hash of its own (incomplete) database.
6464
Tracking the revision associated with each downloaded key range, as well as using data in its own
65-
(incomplete) database, allows the client to figure out which key ranges are not up to date and need to be synced.
65+
(incomplete) database, allows the client to figure out which key ranges are not up-to-date and need to be synced.
6666
The hash of the incomplete database on a client is never sent anywhere because it does not represent a root hash of any revision.
6767

6868
When the client is created, it is given the root hash of the revision to sync to.
@@ -94,7 +94,7 @@ The sync client can be notified that the root hash of the database it's trying t
9494
Detecting that the root hash to sync to has changed is done outside this package.
9595
For example, if the database is being used to store blockchain state then the sync client would be
9696
notified when a new block is accepted because that implies a commit to the database.
97-
If this occurs, the key-value pairs the client has learned about via range proofs may no longer be up to date.
97+
If this occurs, the key-value pairs the client has learned about via range proofs may no longer be up-to-date.
9898

9999
We use change proofs as an optimization to correct the out of date key-value pairs.
100100
When the sync client is notified that the root hash to sync to has changed, it requests a change proof

0 commit comments

Comments
 (0)