Skip to content

Commit

Permalink
Fix compiling core to JS targets
Browse files Browse the repository at this point in the history
  • Loading branch information
PlasmaPower committed Sep 27, 2021
1 parent 57a3fab commit cd8f5f4
Show file tree
Hide file tree
Showing 2 changed files with 127 additions and 22 deletions.
29 changes: 7 additions & 22 deletions core/rawdb/freezer.go
Expand Up @@ -21,7 +21,6 @@ import (
"fmt"
"math"
"os"
"path/filepath"
"sync"
"sync/atomic"
"time"
Expand All @@ -31,7 +30,6 @@ import (
"github.com/ethereum/go-ethereum/log"
"github.com/ethereum/go-ethereum/metrics"
"github.com/ethereum/go-ethereum/params"
"github.com/prometheus/tsdb/fileutil"
)

var (
Expand Down Expand Up @@ -84,9 +82,8 @@ type freezer struct {
writeLock sync.Mutex
writeBatch *freezerBatch

readonly bool
tables map[string]*freezerTable // Data tables for storing everything
instanceLock fileutil.Releaser // File-system lock to prevent double opens
readonly bool
tables map[string]*freezerTable // Data tables for storing everything

trigger chan chan struct{} // Manual blocking freeze trigger, test determinism

Expand Down Expand Up @@ -114,20 +111,13 @@ func newFreezer(datadir string, namespace string, readonly bool, maxTableSize ui
return nil, errSymlinkDatadir
}
}
// Leveldb uses LOCK as the filelock filename. To prevent the
// name collision, we use FLOCK as the lock name.
lock, _, err := fileutil.Flock(filepath.Join(datadir, "FLOCK"))
if err != nil {
return nil, err
}
// Open all the supported data tables
freezer := &freezer{
readonly: readonly,
threshold: params.FullImmutabilityThreshold,
tables: make(map[string]*freezerTable),
instanceLock: lock,
trigger: make(chan chan struct{}),
quit: make(chan struct{}),
readonly: readonly,
threshold: params.FullImmutabilityThreshold,
tables: make(map[string]*freezerTable),
trigger: make(chan chan struct{}),
quit: make(chan struct{}),
}

// Create the tables.
Expand All @@ -137,7 +127,6 @@ func newFreezer(datadir string, namespace string, readonly bool, maxTableSize ui
for _, table := range freezer.tables {
table.Close()
}
lock.Release()
return nil, err
}
freezer.tables[name] = table
Expand All @@ -148,7 +137,6 @@ func newFreezer(datadir string, namespace string, readonly bool, maxTableSize ui
for _, table := range freezer.tables {
table.Close()
}
lock.Release()
return nil, err
}

Expand All @@ -174,9 +162,6 @@ func (f *freezer) Close() error {
errs = append(errs, err)
}
}
if err := f.instanceLock.Release(); err != nil {
errs = append(errs, err)
}
})
if errs != nil {
return fmt.Errorf("%v", errs)
Expand Down
120 changes: 120 additions & 0 deletions ethdb/leveldb/fake_leveldb.go
@@ -0,0 +1,120 @@
// Copyright 2021 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// The go-ethereum library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public License
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.

//go:build js
// +build js

// Package leveldb implements the key-value database layer based on LevelDB.
package leveldb

import (
"errors"

"github.com/ethereum/go-ethereum/ethdb"
)

type Database struct {
unconstructable struct{}
}

// New returns a wrapped LevelDB object. The namespace is the prefix that the
// metrics reporting should use for surfacing internal stats.
func New(file string, cache int, handles int, namespace string, readonly bool) (*Database, error) {
return nil, errors.New("leveldb is unavailable on JS platforms")
}

/*
// NewCustom returns a wrapped LevelDB object. The namespace is the prefix that the
// metrics reporting should use for surfacing internal stats.
// The customize function allows the caller to modify the leveldb options.
func NewCustom(file string, namespace string, customize func(options *opt.Options)) (*Database, error) {
return nil, errors.New("leveldb is unavailable on JS platforms")
}
// configureOptions sets some default options, then runs the provided setter.
func configureOptions(customizeFn func(*opt.Options)) *opt.Options {
// Set default options
options := &opt.Options{
Filter: filter.NewBloomFilter(10),
DisableSeeksCompaction: true,
}
// Allow caller to make custom modifications to the options
if customizeFn != nil {
customizeFn(options)
}
return options
}
*/

// Close stops the metrics collection, flushes any pending data to disk and closes
// all io accesses to the underlying key-value store.
func (db *Database) Close() error {
panic("Method called on unconstructable leveldb database")
}

// Has retrieves if a key is present in the key-value store.
func (db *Database) Has(key []byte) (bool, error) {
panic("Method called on unconstructable leveldb database")
}

// Get retrieves the given key if it's present in the key-value store.
func (db *Database) Get(key []byte) ([]byte, error) {
panic("Method called on unconstructable leveldb database")
}

// Put inserts the given value into the key-value store.
func (db *Database) Put(key []byte, value []byte) error {
panic("Method called on unconstructable leveldb database")
}

// Delete removes the key from the key-value store.
func (db *Database) Delete(key []byte) error {
panic("Method called on unconstructable leveldb database")
}

// NewBatch creates a write-only key-value store that buffers changes to its host
// database until a final write is called.
func (db *Database) NewBatch() ethdb.Batch {
panic("Method called on unconstructable leveldb database")
}

// NewIterator creates a binary-alphabetical iterator over a subset
// of database content with a particular key prefix, starting at a particular
// initial key (or after, if it does not exist).
func (db *Database) NewIterator(prefix []byte, start []byte) ethdb.Iterator {
panic("Method called on unconstructable leveldb database")
}

// Stat returns a particular internal stat of the database.
func (db *Database) Stat(property string) (string, error) {
panic("Method called on unconstructable leveldb database")
}

// Compact flattens the underlying data store for the given key range. In essence,
// deleted and overwritten versions are discarded, and the data is rearranged to
// reduce the cost of operations needed to access them.
//
// A nil start is treated as a key before all keys in the data store; a nil limit
// is treated as a key after all keys in the data store. If both is nil then it
// will compact entire data store.
func (db *Database) Compact(start []byte, limit []byte) error {
panic("Method called on unconstructable leveldb database")
}

// Path returns the path to the database directory.
func (db *Database) Path() string {
panic("Method called on unconstructable leveldb database")
}

0 comments on commit cd8f5f4

Please sign in to comment.